From patchwork Wed Oct  3 10:52:57 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [2/6] Use machine options to emulate -no-kvm-irqchip
Date: Wed, 03 Oct 2012 00:52:57 -0000
From: Marcelo Tosatti <mtosatti@redhat.com>
X-Patchwork-Id: 188747
Message-Id: <20121003105509.391284251@amt.cnet>
To: qemu-devel@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>,
 Marcelo Tosatti <mtosatti@redhat.com>, kvm@vger.kernel.org

Commit 3ad763fcba5bd0ec5a79d4a9b6baeef119dd4a3d from qemu-kvm.git.

From: Jan Kiszka <jan.kiszka@siemens.com>
    
Upstream is moving towards this mechanism, so start using it in qemu-kvm
already to configure the specific defaults: kvm enabled on, just like
in-kernel irqchips.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>


Index: qemu-compat-kvm/vl.c
===================================================================
--- qemu-compat-kvm.orig/vl.c
+++ qemu-compat-kvm/vl.c
@@ -3061,6 +3061,12 @@ int main(int argc, char **argv, char **e
                     machine = machine_parse(optarg);
                 }
                 break;
+            case QEMU_OPTION_no_kvm_irqchip: {
+                olist = qemu_find_opts("machine");
+                qemu_opts_parse(olist, "kernel_irqchip=off", 0);
+                break;
+            }
+
             case QEMU_OPTION_usb:
                 usb_enabled = 1;
                 break;
Index: qemu-compat-kvm/qemu-options.hx
===================================================================
--- qemu-compat-kvm.orig/qemu-options.hx
+++ qemu-compat-kvm/qemu-options.hx
@@ -2838,6 +2838,10 @@ STEXI
 Enable FIPS 140-2 compliance mode.
 ETEXI
 
+DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip,
+    "-no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC\n",
+    QEMU_ARCH_I386)
+
 HXCOMM This is the last statement. Insert new options before this line!
 STEXI
 @end table