From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57608) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5HkL-0006cx-5e for qemu-devel@nongnu.org; Mon, 20 Jan 2014 11:30:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W5HkF-0006RX-6Z for qemu-devel@nongnu.org; Mon, 20 Jan 2014 11:30:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:15913) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5HkE-0006RG-Pd for qemu-devel@nongnu.org; Mon, 20 Jan 2014 11:30:39 -0500 Date: Mon, 20 Jan 2014 18:35:17 +0200 From: "Michael S. Tsirkin" Message-ID: <20140120163517.GA13407@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] piix4: disable bridge acpi hotplug for 1.7 and older List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Igor Mammedov , Andreas =?iso-8859-1?Q?F=E4rber?= , Anthony Liguori , Eduardo Habkost Patch was written before 1.7 was out, forgot to update. Signed-off-by: Michael S. Tsirkin --- I moved for_anthony tag to include this patch as well, no reason to make people suffer until next pull request. hw/i386/pc_piix.c | 4 ++++ include/hw/i386/pc.h | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 2766414..a327d71 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -393,6 +393,10 @@ static QEMUMachine pc_i440fx_machine_v1_7 = { PC_I440FX_1_7_MACHINE_OPTIONS, .name = "pc-i440fx-1.7", .init = pc_init_pci_1_7, + .compat_props = (GlobalProperty[]) { + PC_COMPAT_1_7, + { /* end of list */ } + }, }; #define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 71653e8..fd9f369 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -240,7 +240,15 @@ uint16_t pvpanic_port(void); int e820_add_entry(uint64_t, uint64_t, uint32_t); +#define PC_COMPAT_1_7 \ + {\ + .driver = "PIIX4_PM",\ + .property = "acpi-pci-hotplug-with-bridge-support",\ + .value = "off",\ + } + #define PC_Q35_COMPAT_1_7 \ + PC_COMPAT_1_7, \ {\ .driver = "hpet",\ .property = HPET_INTCAP,\ @@ -261,11 +269,6 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); #define PC_COMPAT_1_6 \ {\ - .driver = "PIIX4_PM",\ - .property = "acpi-pci-hotplug-with-bridge-support",\ - .value = "off",\ - }, \ - {\ .driver = "e1000",\ .property = "mitigation",\ .value = "off",\ -- MST