cryptospore / rpms / qemu-kvm

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