From fa96692ab98b4ce5734b8030c1b675657aa086ac Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert (git)" Date: Thu, 16 Jan 2014 16:15:05 -0500 Subject: Add back -no-hpet but ignore it Message-id: <1389888905-31880-1-git-send-email-dgilbert@redhat.com> Patchwork-id: 56754 O-Subject: [RHEL-7.0 qemu-kvm PATCH 1/1] Add back -no-hpet but ignore it Bugzilla: 1044742 RH-Acked-by: Paolo Bonzini RH-Acked-by: Markus Armbruster RH-Acked-by: Jiri Denemark From: "Dr. David Alan Gilbert" BZ: 1044742 Brew: https://brewweb.devel.redhat.com/taskinfo?taskID=6886373 Upstream-status: Red Hat only Undoes some of bz947441, in that we keep the -no-hpet command line option, for compatibility with libvirt since it has no way of knowing that it was removed. Since hpet is disabled anyway, keeping the option does no harm. diff --git a/qemu-options.hx b/qemu-options.hx index 1286904..81545ae 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1329,10 +1329,8 @@ it if your guest OS complains about ACPI problems (PC target machine only). ETEXI -#if 0 /* Disabled for Red Hat Enterprise Linux */ DEF("no-hpet", 0, QEMU_OPTION_no_hpet, "-no-hpet disable HPET\n", QEMU_ARCH_I386) -#endif DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable, "-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,{data|file}=file1[:file2]...]\n" diff --git a/vl.c b/vl.c index d225b8f..83e8b1a 100644 --- a/vl.c +++ b/vl.c @@ -3751,11 +3751,9 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_no_acpi: acpi_enabled = 0; break; -#if 0 /* Disabled for Red Hat Enterprise Linux */ 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);