diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2012-03-29 14:07:46 +0200 |
|---|---|---|
| committer | Jan Kiszka <jan.kiszka@siemens.com> | 2012-04-16 15:41:36 +0200 |
| commit | 9bea6a2956e5d473b8914b2a5483fbf187b33844 (patch) | |
| tree | a77fc7534025323c6cc694506b701949976b63ea /hw/pc_piix.c | |
| parent | 98c8ee1da81b88252263f9215ca23b2044650696 (diff) | |
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>
Diffstat (limited to 'hw/pc_piix.c')
| -rw-r--r-- | hw/pc_piix.c | 43 |
1 files changed, 33 insertions, 10 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index fadca4c710..44995bfdc1 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 */ } }, |