From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V57mU-0007v1-De for qemu-devel@nongnu.org; Fri, 02 Aug 2013 01:20:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4sBE-0000DQ-CW for qemu-devel@nongnu.org; Thu, 01 Aug 2013 08:40:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4453) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4sBE-0000DA-1m for qemu-devel@nongnu.org; Thu, 01 Aug 2013 08:40:32 -0400 Date: Thu, 1 Aug 2013 15:42:05 +0300 From: "Michael S. Tsirkin" Message-ID: <20130801124204.GA25947@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH for-1.6] pc: disable pci-info for 1.6 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Anthony Liguori , Andreas =?iso-8859-1?Q?F=E4rber?= , Igor Mammedov , Gerd Hoffmann The BIOS that we ship in 1.6 does not use pci info from host (yet). So it's safest to disable that interface for 1.6 machine types for now, leave it on for 1.7 as we have enough time to fix issues if any. Signed-off-by: Michael S. Tsirkin --- hw/i386/pc_piix.c | 9 +++++++-- hw/i386/pc_q35.c | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ab25458..7e5a785 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -249,12 +249,17 @@ static void pc_init_pci(QEMUMachineInitArgs *args) initrd_filename, cpu_model, 1, 1); } -static void pc_init_pci_1_5(QEMUMachineInitArgs *args) +static void pc_init_pci_1_6(QEMUMachineInitArgs *args) { has_pci_info = false; pc_init_pci(args); } +static void pc_init_pci_1_5(QEMUMachineInitArgs *args) +{ + pc_init_pci(args); +} + static void pc_init_pci_1_4(QEMUMachineInitArgs *args) { has_pvpanic = false; @@ -340,7 +345,7 @@ static QEMUMachine pc_i440fx_machine_v1_6 = { .name = "pc-i440fx-1.6", .alias = "pc", .desc = "Standard PC (i440FX + PIIX, 1996)", - .init = pc_init_pci, + .init = pc_init_pci_1_6, .hot_add_cpu = pc_hot_add_cpu, .max_cpus = 255, .is_default = 1, diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 2f35d12..6bfc2ca 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -217,12 +217,17 @@ static void pc_q35_init(QEMUMachineInitArgs *args) } } -static void pc_q35_init_1_5(QEMUMachineInitArgs *args) +static void pc_q35_init_1_6(QEMUMachineInitArgs *args) { has_pci_info = false; pc_q35_init(args); } +static void pc_q35_init_1_5(QEMUMachineInitArgs *args) +{ + pc_q35_init_1_6(args); +} + static void pc_q35_init_1_4(QEMUMachineInitArgs *args) { has_pvpanic = false; @@ -234,7 +239,7 @@ static QEMUMachine pc_q35_machine_v1_6 = { .name = "pc-q35-1.6", .alias = "q35", .desc = "Standard PC (Q35 + ICH9, 2009)", - .init = pc_q35_init, + .init = pc_q35_init_1_6, .hot_add_cpu = pc_hot_add_cpu, .max_cpus = 255, DEFAULT_MACHINE_OPTIONS, -- MST