jes.soren...@redhat.com wrote:
> From: Jes Sorensen <jes.soren...@redhat.com>
>
> Only accept -no-hpet for i386 targets
>
> Signed-off-by: Jes Sorensen <jes.soren...@redhat.com>
> ---
> vl.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index e4a9aa9..1977409 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -3328,9 +3328,11 @@ int main(int argc, char **argv, char **envp)
> case QEMU_OPTION_no_acpi:
> acpi_enabled = 0;
> break;
> +#ifdef TARGET_I386
> case QEMU_OPTION_no_hpet:
> no_hpet = 1;
> break;
> +#endif
> case QEMU_OPTION_balloon:
> if (balloon_parse(optarg) < 0) {
> fprintf(stderr, "Unknown -balloon argument %s\n",
> optarg);
Upstream carries no-hpet unconditionally now. I guess you need to clean
up a different merge artifact.
Jan
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
