david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vapic: Disable for pre-1.1 machines

Browse Source 
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>
This commit is contained in:
Jan Kiszka 2012-03-29 14:07:46 +02:00
parent 98c8ee1da8
commit 9bea6a2956
1 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
hw/pc_piix.c
View File

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