Patchwork [v2,for-1.6] pc: disable pci-info for 1.6

login
register
mail settings
Submitter Michael S. Tsirkin
Date Aug. 8, 2013, 3:55 p.m.
Message ID <20130808155543.GA31933@redhat.com>
Download mbox | patch
Permalink /patch/265758/
State New
Headers show

Comments

Michael S. Tsirkin - Aug. 8, 2013, 3:55 p.m.
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 <rth@twiddle.net>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

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(-)
Richard Henderson - Aug. 8, 2013, 4:01 p.m.
On 08/08/2013 05:55 AM, Michael S. Tsirkin wrote:
> 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 <rth@twiddle.net>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Reviewed-by: Richard Henderson <rth@twiddle.net>


r~
Andreas Färber - Aug. 8, 2013, 4:25 p.m.
Am 08.08.2013 17:55, schrieb Michael S. Tsirkin:
> 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 <rth@twiddle.net>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Looks correct now,

Reviewed-by: Andreas Färber <afaerber@suse.de>

Andreas

Patch

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,