Patchwork vapic: Disable for pre-1.1 machines

login
register
mail settings
Submitter Jan Kiszka
Date March 29, 2012, 12:14 p.m.
Message ID <4F74520F.3000700@siemens.com>
Download mbox | patch
Permalink /patch/149386/
State New
Headers show

Comments

Jan Kiszka - March 29, 2012, 12:14 p.m.
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 files changed, 33 insertions(+), 10 deletions(-)

Patch

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 3f99f9a..8061960 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -386,6 +386,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 */ }
     },
@@ -405,6 +409,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 */ }
     },
@@ -444,11 +452,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 */ }
     },
@@ -500,11 +511,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 */ }
     },
@@ -560,11 +574,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 */ }
     }
@@ -628,11 +645,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 */ }
     }
@@ -708,11 +728,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 */ }
     },