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