summaryrefslogtreecommitdiff
path: root/hw/i386/pc_q35.c
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2013-08-01 15:39:11 +0300
committerMichael S. Tsirkin <mst@redhat.com>2013-08-12 12:05:33 +0300
commit9604f70fdf8e21ec0dbf6eac5e59a0eb8beadd64 (patch)
treeddc1bc6eb6358c369f97c30336a22547ee74c8a9 /hw/i386/pc_q35.c
parent6fdf98f281f85ae6e2883bed2f691bcfe33b1f9f (diff)
downloadqemu-9604f70fdf8e21ec0dbf6eac5e59a0eb8beadd64.tar.gz
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: Richard Henderson <rth@twiddle.net> Reviewed-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/i386/pc_q35.c')
-rw-r--r--hw/i386/pc_q35.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 2f35d12bf2..6bfc2ca92e 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,