Skip to contentSkip to conversation

pc: disable pci-info for 1.6

PATCH Superseded Michael S. Tsirkin 2 participants 2 messages Aug 2, 2013

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Michael S. Tsirkin

author
#0 lore raw

PATCH 1/1 pc: disable pci-info for 1.6

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 <[email protected]>
---
 hw/i386/pc_piix.c | 9 +++++++--
 hw/i386/pc_q35.c  | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)
hw/i386/pc_piix.c +7 -2
index ab25458..7e5a785 100644
@@ -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,
hw/i386/pc_q35.c +7 -2
index 2f35d12..6bfc2ca 100644
@@ -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,
Signature · 1 line
MST
#1 lore raw

hw/i386/pc_piix.c static void pc_init_pci(QEMUMachineInitArgs *args) · line 261

Quoted 11 lines · Michael S. Tsirkin
hw/i386/pc_piix.c +5 -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);
+}

Surely the numbers aren't right here. Aren't you now enabling pci_info for 1.5, when it was disabled previously?

r~