From ccddccebb17435c44b66d27d0ad0d9e32f6a3994 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Fri, 2 Oct 2009 16:51:29 -0300
Subject: [PATCH 1/7] Disable help for vmware vga and enable-nesting

RH-Author: Juan Quintela <quintela@redhat.com>
Message-id: <8a07299df71a9aceca70f8ffd8d7e2a3cb84ae7c.1253127992.git.quintela@redhat.com>
Patchwork-id: 3427
O-Subject: [PATCH 3/3] Disable help for vmware vga and enable-nesting
Bugzilla: 516672
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>

This was missing on my 5.4 disable series.  Found by QE

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 qemu/vl.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/vl.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/qemu/vl.c b/qemu/vl.c
index a89a373..54b7c41 100644
--- a/qemu/vl.c
+++ b/qemu/vl.c
@@ -4232,7 +4232,11 @@ static void help(int exitcode)
            "                use -soundhw ? to get the list of supported cards\n"
            "                use -soundhw all to enable all of them\n"
 #endif
-           "-vga [std|cirrus|vmware]\n"
+           "-vga [std|cirrus"
+#ifdef CONFIG_VMWARE
+           "|vmware"
+#endif
+           "]\n"
            "                select video card type\n"
            "-localtime      set the real time clock to local time [default=utc]\n"
            "-full-screen    start in full screen\n"
@@ -4343,7 +4347,9 @@ static void help(int exitcode)
 	   "-no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC\n"
 	   "-no-kvm-pit	    disable KVM kernel mode PIT\n"
 	   "-no-kvm-pit-reinjection disable KVM kernel mode PIT interrupt reinjection\n"
+#ifdef CONFIG_KVM_NESTED
 	   "-enable-nesting enable support for running a VM inside the VM (AMD only)\n"
+#endif
 #if defined(TARGET_I386) || defined(TARGET_X86_64) || defined(TARGET_IA64) || defined(__linux__)
            "-pcidevice host=bus:dev.func[,dma=none][,name=string]\n"
            "                expose a PCI device to the guest OS.\n"
-- 
1.6.3.rc4.29.g8146