pc: add 1.8 machine type
PATCH 1/1 pc: add 1.8 machine type
I already have several patches that affect compatibility between 1.8 and 1.7 queued, so we need pc compat structures in place.
Signed-off-by Michael S. Tsirkin <[email protected]>
--- hw/i386/pc_piix.c | 27 +++++++++++++++++++++++---- hw/i386/pc_q35.c | 24 ++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 6 deletions(-)
hw/i386/pc_piix.c +23 -4
@@ -238,6 +238,10 @@ static void pc_init_pci(QEMUMachineInitArgs *args)pc_init1 (args,1 ,1 ); } +static void pc_compat_1_7 (QEMUMachineInitArgs *args) +{ +} +static void pc_compat_1_6 (QEMUMachineInitArgs *args) { has_pci_info = false;
@@ -272,6 +276,12 @@ static void pc_compat_1_2(QEMUMachineInitArgs *args)disable_kvm_pv_eoi (); } +static void pc_init_pci_1_7 (QEMUMachineInitArgs *args) +{ +pc_compat_1_7 (args); +pc_init_pci (args); +} +static void pc_init_pci_1_6 (QEMUMachineInitArgs *args) {pc_compat_1_6 (args);
@@ -344,15 +354,23 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args) .desc = "Standard PC (i440FX + PIIX, 1996)", \ .hot_add_cpu = pc_hot_add_cpu -#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS -static QEMUMachine pc_i440fx_machine_v1_7 = { -PC_I440FX_1_7_MACHINE_OPTIONS , - .name ="pc-i440fx-1.7" , + +#define PC_I440FX_1_8_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS +static QEMUMachine pc_i440fx_machine_v1_8 = { +PC_I440FX_1_8_MACHINE_OPTIONS , + .name ="pc-i440fx-1.8" , .alias ="pc" , .init = pc_init_pci, .is_default =1 , }; +#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_1_8_MACHINE_OPTIONS +static QEMUMachine pc_i440fx_machine_v1_7 = { +PC_I440FX_1_7_MACHINE_OPTIONS , + .name ="pc-i440fx-1.7" , + .init = pc_init_pci_1_7, +}; +#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONSstatic QEMUMachine pc_i440fx_machine_v1_6 = {
@@ -752,6 +770,7 @@ static QEMUMachine xenfv_machine = {static void pc_machine_init (void ) { +qemu_register_machine (&pc_i440fx_machine_v1_8);qemu_register_machine (&pc_i440fx_machine_v1_7);qemu_register_machine (&pc_i440fx_machine_v1_6);qemu_register_machine (&pc_i440fx_machine_v1_5);
hw/i386/pc_q35.c +22 -2
@@ -222,6 +222,10 @@ static void pc_q35_init(QEMUMachineInitArgs *args) } } +static void pc_compat_1_7 (QEMUMachineInitArgs *args) +{ +} +static void pc_compat_1_6 (QEMUMachineInitArgs *args) { has_pci_info = false;
@@ -243,6 +247,12 @@ static void pc_compat_1_4(QEMUMachineInitArgs *args)x86_cpu_compat_set_features ("Westmere" ,FEAT_1_ECX ,0 ,CPUID_EXT_PCLMULQDQ ); } +static void pc_q35_init_1_7 (QEMUMachineInitArgs *args) +{ +pc_compat_1_7 (args); +pc_q35_init (args); +} +static void pc_q35_init_1_6 (QEMUMachineInitArgs *args) {pc_compat_1_6 (args);
@@ -266,16 +276,25 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *args) .desc = "Standard PC (Q35 + ICH9, 2009)", \ .hot_add_cpu = pc_hot_add_cpu +#define PC_Q35_1_8_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS + +static QEMUMachine pc_q35_machine_v1_8 = { +PC_Q35_1_8_MACHINE_OPTIONS , + .name ="pc-q35-1.8" , + .alias ="q35" , + .init = pc_q35_init, +}; +#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONSstatic QEMUMachine pc_q35_machine_v1_7 = {PC_Q35_1_7_MACHINE_OPTIONS , .name ="pc-q35-1.7" , .alias ="q35" , - .init = pc_q35_init, + .init = pc_q35_init_1_7, }; -#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS +#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_1_7_MACHINE_OPTIONSstatic QEMUMachine pc_q35_machine_v1_6 = {PC_Q35_1_6_MACHINE_OPTIONS ,
@@ -313,6 +332,7 @@ static QEMUMachine pc_q35_machine_v1_4 = {static void pc_q35_machine_init (void ) { +qemu_register_machine (&pc_q35_machine_v1_8);qemu_register_machine (&pc_q35_machine_v1_7);qemu_register_machine (&pc_q35_machine_v1_6);qemu_register_machine (&pc_q35_machine_v1_5);
Signature · 1 line
MST
Il 13/11/2013 20:35, Michael S. Tsirkin ha scritto:
hw/i386/pc_piix.c static void pc_init_pci(QEMUMachineInitArgs *args) · line 247
Quoted 7 lines
hw/i386/pc_piix.c +4
-0+static void pc_compat_1_7 (QEMUMachineInitArgs *args) +{ +} +static void pc_compat_1_6 (QEMUMachineInitArgs *args) { has_pci_info = false;
This should call pc_compat_1_7(args), for both piix and q35.
Il 13/11/2013 20:35, Michael S. Tsirkin ha scritto:
hw/i386/pc_q35.c static void pc_q35_init_1_4(QEMUMachineInitArgs *args) · line 288
Quoted 8 lines
hw/i386/pc_q35.c +7
-0+static QEMUMachine pc_q35_machine_v1_8 = { +PC_Q35_1_8_MACHINE_OPTIONS , + .name ="pc-q35-1.8" , + .alias ="q35" , + .init = pc_q35_init, +}; +#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
Also, you probably want
#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_1_8_MACHINE_OPTIONS
here for consistency.