From 9bea6a2956e5d473b8914b2a5483fbf187b33844 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Thu, 29 Mar 2012 14:07:46 +0200
Subject: [PATCH] vapic: Disable for pre-1.1 machines

The kvmvapic was not present in older QEMU versions, thus must be
disabled in compat machines.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 hw/pc_piix.c | 43 +++++++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index fadca4c..44995bf 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -373,6 +373,10 @@ static QEMUMachine pc_machine_v1_0 = {
             .driver   = "isa-fdc",
             .property = "check_media_rate",
             .value    = "off",
+        },{
+            .driver   = "apic",
+            .property = "vapic",
+            .value    = "off",
         },
         { /* end of list */ }
     },
@@ -392,6 +396,10 @@ static QEMUMachine pc_machine_v0_15 = {
             .driver   = "isa-fdc",
             .property = "check_media_rate",
             .value    = "off",
+        },{
+            .driver   = "apic",
+            .property = "vapic",
+            .value    = "off",
         },
         { /* end of list */ }
     },
@@ -431,11 +439,14 @@ static QEMUMachine pc_machine_v0_14 = {
             .driver   = "isa-fdc",
             .property = "check_media_rate",
             .value    = "off",
-        },
-        {
+        },{
             .driver   = "pc-sysfw",
             .property = "rom_only",
             .value    = stringify(1),
+        },{
+            .driver   = "apic",
+            .property = "vapic",
+            .value    = "off",
         },
         { /* end of list */ }
     },
@@ -487,11 +498,14 @@ static QEMUMachine pc_machine_v0_13 = {
             .driver   = "isa-fdc",
             .property = "check_media_rate",
             .value    = "off",
-        },
-        {
+        },{
             .driver   = "pc-sysfw",
             .property = "rom_only",
             .value    = stringify(1),
+        },{
+            .driver   = "apic",
+            .property = "vapic",
+            .value    = "off",
         },
         { /* end of list */ }
     },
@@ -547,11 +561,14 @@ static QEMUMachine pc_machine_v0_12 = {
             .driver   = "isa-fdc",
             .property = "check_media_rate",
             .value    = "off",
-        },
-        {
+        },{
             .driver   = "pc-sysfw",
             .property = "rom_only",
             .value    = stringify(1),
+        },{
+            .driver   = "apic",
+            .property = "vapic",
+            .value    = "off",
         },
         { /* end of list */ }
     }
@@ -615,11 +632,14 @@ static QEMUMachine pc_machine_v0_11 = {
             .driver   = "isa-fdc",
             .property = "check_media_rate",
             .value    = "off",
-        },
-        {
+        },{
             .driver   = "pc-sysfw",
             .property = "rom_only",
             .value    = stringify(1),
+        },{
+            .driver   = "apic",
+            .property = "vapic",
+            .value    = "off",
         },
         { /* end of list */ }
     }
@@ -695,11 +715,14 @@ static QEMUMachine pc_machine_v0_10 = {
             .driver   = "isa-fdc",
             .property = "check_media_rate",
             .value    = "off",
-        },
-        {
+        },{
             .driver   = "pc-sysfw",
             .property = "rom_only",
             .value    = stringify(1),
+        },{
+            .driver   = "apic",
+            .property = "vapic",
+            .value    = "off",
         },
         { /* end of list */ }
     },
-- 
2.7.4