From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47495) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDEF5-0001v3-1E for qemu-devel@nongnu.org; Thu, 29 Mar 2012 08:14:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SDEF2-0007oI-UW for qemu-devel@nongnu.org; Thu, 29 Mar 2012 08:14:14 -0400 Received: from david.siemens.de ([192.35.17.14]:29237) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDEF2-0007o2-LM for qemu-devel@nongnu.org; Thu, 29 Mar 2012 08:14:12 -0400 Message-ID: <4F74520F.3000700@siemens.com> Date: Thu, 29 Mar 2012 14:14:07 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] vapic: Disable for pre-1.1 machines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , qemu-devel Cc: Avi Kivity The kvmvapic was not present in older QEMU versions, thus must be disabled in compat machines. Signed-off-by: Jan Kiszka --- 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 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 */ } }, -- 1.7.3.4