From patchwork Thu Aug 8 15:55:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 265758 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8FB582C00A7 for ; Fri, 9 Aug 2013 01:54:42 +1000 (EST) Received: from localhost ([::1]:45034 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7SXt-0006ln-C2 for incoming@patchwork.ozlabs.org; Thu, 08 Aug 2013 11:54:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56017) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7SXZ-0006kp-Mu for qemu-devel@nongnu.org; Thu, 08 Aug 2013 11:54:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V7SXR-000194-Lt for qemu-devel@nongnu.org; Thu, 08 Aug 2013 11:54:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62434) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7SXR-00017F-ED for qemu-devel@nongnu.org; Thu, 08 Aug 2013 11:54:09 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r78Fs8fs016084 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 Aug 2013 11:54:08 -0400 Received: from redhat.com (vpn1-6-24.ams2.redhat.com [10.36.6.24]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id r78Fs4On024677; Thu, 8 Aug 2013 11:54:05 -0400 Date: Thu, 8 Aug 2013 18:55:43 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <20130808155543.GA31933@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , "Michael S. Tsirkin" , Gerd Hoffmann , Igor Mammedov , Paolo Bonzini , Andreas =?iso-8859-1?Q?F=E4rber?= , Richard Henderson Subject: [Qemu-devel] [PATCH v2 for-1.6] pc: disable pci-info for 1.6 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The BIOS that we ship in 1.6 does not use pci info from host (yet). Several issues turned up (e.g. around winXP boot crashes). So it's safest to disable that interface for 1.6 machine types for now, leave it on for 1.7 so we have enough time to figure out the right way to fix issues if any. Cc: Richard Henderson Signed-off-by: Michael S. Tsirkin Reviewed-by: Richard Henderson Reviewed-by: Andreas Färber --- Changes from v1: fix reversed logic noted by Richard Henderson 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..95c45b8 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_1_6(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,