|
 |
218e99 |
From 6a547c27c5d359af376fdb277ea05eea0d76e870 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
Date: Fri, 30 Aug 2013 08:51:25 +0200
|
|
|
218e99 |
Subject: [PATCH 06/29] Remove no-hpet option
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
Message-id: <9d2bbee5227f35ee23da66a8689a9cd0faf545f1.1377851454.git.mrezanin@redhat.com>
|
|
|
218e99 |
Patchwork-id: 53936
|
|
|
218e99 |
O-Subject: [RHEL7 qemu-kvm PATCHv2 5/6] Remove no-hpet option
|
|
|
218e99 |
Bugzilla: 947441
|
|
|
218e99 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Michal Novotny <minovotn@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
Bugzilla: 947441
|
|
|
218e99 |
Upstream: n/a, RHEL only
|
|
|
218e99 |
|
|
|
218e99 |
We disable HPET for RHEL, this patch removes option no-hpet that is
|
|
|
218e99 |
not usable.
|
|
|
218e99 |
|
|
|
218e99 |
Patch is forwardport of RHEL6 patch 1c07ac51 with small difference in
|
|
|
218e99 |
qemu-options.hx STEXI part of no-hpet is removed to keep man page
|
|
|
218e99 |
updated.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
v2:
|
|
|
218e99 |
- Remove only STEXI part
|
|
|
218e99 |
---
|
|
|
218e99 |
qemu-options.hx | 7 ++-----
|
|
|
218e99 |
vl.c | 4 +++-
|
|
|
218e99 |
2 files changed, 5 insertions(+), 6 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
qemu-options.hx | 7 ++-----
|
|
|
218e99 |
vl.c | 4 +++-
|
|
|
218e99 |
2 files changed, 5 insertions(+), 6 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/qemu-options.hx b/qemu-options.hx
|
|
|
218e99 |
index 2ad0ed2..202a2cf 100644
|
|
|
218e99 |
--- a/qemu-options.hx
|
|
|
218e99 |
+++ b/qemu-options.hx
|
|
|
218e99 |
@@ -1283,13 +1283,10 @@ it if your guest OS complains about ACPI problems (PC target machine
|
|
|
218e99 |
only).
|
|
|
218e99 |
ETEXI
|
|
|
218e99 |
|
|
|
218e99 |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
218e99 |
DEF("no-hpet", 0, QEMU_OPTION_no_hpet,
|
|
|
218e99 |
"-no-hpet disable HPET\n", QEMU_ARCH_I386)
|
|
|
218e99 |
-STEXI
|
|
|
218e99 |
-@item -no-hpet
|
|
|
218e99 |
-@findex -no-hpet
|
|
|
218e99 |
-Disable HPET support.
|
|
|
218e99 |
-ETEXI
|
|
|
218e99 |
+#endif
|
|
|
218e99 |
|
|
|
218e99 |
DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable,
|
|
|
218e99 |
"-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"
|
|
|
218e99 |
diff --git a/vl.c b/vl.c
|
|
|
218e99 |
index f7b326a..24536b5 100644
|
|
|
218e99 |
--- a/vl.c
|
|
|
218e99 |
+++ b/vl.c
|
|
|
218e99 |
@@ -217,7 +217,7 @@ int smp_threads = 1;
|
|
|
218e99 |
const char *vnc_display;
|
|
|
218e99 |
#endif
|
|
|
218e99 |
int acpi_enabled = 1;
|
|
|
218e99 |
-int no_hpet = 0;
|
|
|
218e99 |
+int no_hpet = 1; /* Always disabled for Red Hat Enterprise Linux */
|
|
|
218e99 |
int fd_bootchk = 1;
|
|
|
218e99 |
static int no_reboot;
|
|
|
218e99 |
int no_shutdown = 0;
|
|
|
218e99 |
@@ -3682,9 +3682,11 @@ int main(int argc, char **argv, char **envp)
|
|
|
218e99 |
case QEMU_OPTION_no_acpi:
|
|
|
218e99 |
acpi_enabled = 0;
|
|
|
218e99 |
break;
|
|
|
218e99 |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
218e99 |
case QEMU_OPTION_no_hpet:
|
|
|
218e99 |
no_hpet = 1;
|
|
|
218e99 |
break;
|
|
|
218e99 |
+#endif
|
|
|
218e99 |
case QEMU_OPTION_balloon:
|
|
|
218e99 |
if (balloon_parse(optarg) < 0) {
|
|
|
218e99 |
fprintf(stderr, "Unknown -balloon argument %s\n", optarg);
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|