Commit 9604f70f authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

pc: disable pci-info for 1.6 



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
as we have enough time to fix issues if any.

Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Reviewed-by: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 6fdf98f2

hw/i386/pc_piix.c

+7 −2
Original line number Diff line number Diff line
@@ -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,

hw/i386/pc_q35.c

+7 −2
Original line number Diff line number Diff line
@@ -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,