cryptospore / rpms / qemu-kvm

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