diff options
| -rw-r--r-- | hw/i386/pc_piix.c | 9 | ||||
| -rw-r--r-- | 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 ab25458cd6..95c45b8e25 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 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, |