pc: add 1.8 machine type
PATCH v2 1/1 pc: add 1.8 machine type
Several changes that affect compatibility between 1.8 and 1.7 are already planned, so we need pc compat structures in place.
---
Changes from v1:
make 1.6 call 1.7 as suggested by Paolo
hw/i386/pc_piix.c | 30 +++++++++++++++++++++++++----- hw/i386/pc_q35.c | 27 ++++++++++++++++++++++++--- 2 files changed, 49 insertions(+), 8 deletions(-)
hw/i386/pc_piix.c +25 -5
@@ -238,8 +238,13 @@ 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) { +pc_compat_1_6 (args); has_pci_info = false; rom_file_in_ram = false; has_acpi_build = false;
@@ -272,6 +277,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,16 +355,24 @@ 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_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS +#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_1_7_MACHINE_OPTIONSstatic QEMUMachine pc_i440fx_machine_v1_6 = {PC_I440FX_1_6_MACHINE_OPTIONS ,
@@ -752,6 +771,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 +24 -3
@@ -222,8 +222,13 @@ static void pc_q35_init(QEMUMachineInitArgs *args) } } +static void pc_compat_1_7 (QEMUMachineInitArgs *args) +{ +} +static void pc_compat_1_6 (QEMUMachineInitArgs *args) { +pc_compat_1_7 (args); has_pci_info = false; rom_file_in_ram = false; has_acpi_build = false;
@@ -243,6 +248,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 +277,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_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS +#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_1_8_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 +333,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 14/11/2013 11:37, Michael S. Tsirkin ha scritto:
Quoted 18 lines
Several changes that affect compatibility between 1.8 and 1.7 are already planned, so we need pc compat structures in place.
Signed-off-by Michael S. Tsirkin <[email protected]>---
Changes from v1:
make 1.6 call 1.7 as suggested by Paolohw/i386/pc_piix.c | 30 +++++++++++++++++++++++++----- hw/i386/pc_q35.c | 27 ++++++++++++++++++++++++--- 2 files changed, 49 insertions(+), 8 deletions(-)hw/i386/pc_piix.c +0
-0
hw/i386/pc_piix.c static void pc_init_pci(QEMUMachineInitArgs *args) · line 247
Quoted 10 lines
hw/i386/pc_piix.c +5
-0@@ -238,8 +238,13 @@ 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) { +pc_compat_1_6 (args);
It's calling itself now. :) q35 is fine.
With the obvious blunder fixed,
Quoted 123 lines
hw/i386/pc_piix.c +20
-5has_pci_info = false; rom_file_in_ram = false; has_acpi_build = false;@@ -272,6 +277,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,16 +355,24 @@ 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_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS +#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_1_7_MACHINE_OPTIONSstatic QEMUMachine pc_i440fx_machine_v1_6 = {PC_I440FX_1_6_MACHINE_OPTIONS ,@@ -752,6 +771,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 +24
-3@@ -222,8 +222,13 @@ static void pc_q35_init(QEMUMachineInitArgs *args) } } +static void pc_compat_1_7 (QEMUMachineInitArgs *args) +{ +} +static void pc_compat_1_6 (QEMUMachineInitArgs *args) { +pc_compat_1_7 (args); has_pci_info = false; rom_file_in_ram = false; has_acpi_build = false;@@ -243,6 +248,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 +277,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_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS +#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_1_8_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 +333,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);
Quoted 11 lines · Michael S. Tsirkin
hw/i386/pc_q35.c +8
-1-#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS +#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, +};
hw/i386/pc_q35.c static void pc_q35_init_1_4(QEMUMachineInitArgs *args) · line 296
Quoted 10 lines
hw/i386/pc_q35.c +3
-1+ +#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_1_8_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, };
Hi Michael
Shouldn't the '.alias' be removed from the 1.7 machine?
Thanks
-vlad
Quoted 14 lines
hw/i386/pc_q35.c +2
-1-#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 +333,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);
Il 14/11/2013 11:37, Michael S. Tsirkin ha scritto:
Quoted 4 lines
Several changes that affect compatibility between 1.8 and 1.7 are already planned, so we need pc compat structures in place.
Signed-off-by Michael S. Tsirkin <[email protected]>
Is this patch in any tree? Also, you mentioned you would pick up Marcelo's 1GB alignment patch.
Thanks,
Paolo
Quoted 146 lines
Changes from v1:
make 1.6 call 1.7 as suggested by Paolohw/i386/pc_piix.c | 30 +++++++++++++++++++++++++----- hw/i386/pc_q35.c | 27 ++++++++++++++++++++++++--- 2 files changed, 49 insertions(+), 8 deletions(-)hw/i386/pc_piix.c +25
-5@@ -238,8 +238,13 @@ 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) { +pc_compat_1_6 (args); has_pci_info = false; rom_file_in_ram = false; has_acpi_build = false;@@ -272,6 +277,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,16 +355,24 @@ 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_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS +#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_1_7_MACHINE_OPTIONSstatic QEMUMachine pc_i440fx_machine_v1_6 = {PC_I440FX_1_6_MACHINE_OPTIONS ,@@ -752,6 +771,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 +24
-3@@ -222,8 +222,13 @@ static void pc_q35_init(QEMUMachineInitArgs *args) } } +static void pc_compat_1_7 (QEMUMachineInitArgs *args) +{ +} +static void pc_compat_1_6 (QEMUMachineInitArgs *args) { +pc_compat_1_7 (args); has_pci_info = false; rom_file_in_ram = false; has_acpi_build = false;@@ -243,6 +248,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 +277,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_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS +#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_1_8_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 +333,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);
Quoted 7 lines · Paolo Bonzini
Il 14/11/2013 11:37, Michael S. Tsirkin ha scritto:
Quoted 4 lines
Several changes that affect compatibility between 1.8 and 1.7 are already planned, so we need pc compat structures in place.
Signed-off-by Michael S. Tsirkin <[email protected]>Is this patch in any tree?
And shouldn't it be rebased to use a 2.0 machine type, since we aren't doing a 1.8 release?
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Quoted 4 lines · Paolo Bonzini
Il 14/11/2013 11:37, Michael S. Tsirkin ha scritto:
Quoted 3 lines
Several changes that affect compatibility between 1.8 and 1.7 are already planned, so we need pc compat structures in place.
Quoted 8 lines
Quoted 1 line
Signed-off-by Michael S. Tsirkin <[email protected]>Is this patch in any tree? Also, you mentioned you would pick up Marcelo's 1GB alignment patch.
Thanks,
Paolo
Both are in my PCI tree.
Quoted 146 lines
Quoted 146 lines
Changes from v1:
make 1.6 call 1.7 as suggested by Paolohw/i386/pc_piix.c | 30 +++++++++++++++++++++++++----- hw/i386/pc_q35.c | 27 ++++++++++++++++++++++++--- 2 files changed, 49 insertions(+), 8 deletions(-)hw/i386/pc_piix.c +25
-5@@ -238,8 +238,13 @@ 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) { +pc_compat_1_6 (args); has_pci_info = false; rom_file_in_ram = false; has_acpi_build = false;@@ -272,6 +277,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,16 +355,24 @@ 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_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS +#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_1_7_MACHINE_OPTIONSstatic QEMUMachine pc_i440fx_machine_v1_6 = {PC_I440FX_1_6_MACHINE_OPTIONS ,@@ -752,6 +771,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 +24
-3@@ -222,8 +222,13 @@ static void pc_q35_init(QEMUMachineInitArgs *args) } } +static void pc_compat_1_7 (QEMUMachineInitArgs *args) +{ +} +static void pc_compat_1_6 (QEMUMachineInitArgs *args) { +pc_compat_1_7 (args); has_pci_info = false; rom_file_in_ram = false; has_acpi_build = false;@@ -243,6 +248,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 +277,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_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS +#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_1_8_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 +333,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);
Il 08/12/2013 12:21, Michael S. Tsirkin ha scritto:
Quoted 7 lines · Paolo Bonzini
Quoted 6 lines
Il 14/11/2013 11:37, Michael S. Tsirkin ha scritto:
Quoted 4 lines
Several changes that affect compatibility between 1.8 and 1.7 are already planned, so we need pc compat structures in place.
Signed-off-by Michael S. Tsirkin <[email protected]>
Quoted 8 lines
Quoted 6 lines
Is this patch in any tree? Also, you mentioned you would pick up Marcelo's 1GB alignment patch.
Thanks,
Paolo
Both are in my PCI tree.
git://github.com/mstsirkin/qemu.git doesn't have it, are you missing a push?
Paolo
Quoted 148 lines
Quoted 146 lines
Quoted 146 lines
Changes from v1:
make 1.6 call 1.7 as suggested by Paolohw/i386/pc_piix.c | 30 +++++++++++++++++++++++++----- hw/i386/pc_q35.c | 27 ++++++++++++++++++++++++--- 2 files changed, 49 insertions(+), 8 deletions(-)hw/i386/pc_piix.c +25
-5@@ -238,8 +238,13 @@ 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) { +pc_compat_1_6 (args); has_pci_info = false; rom_file_in_ram = false; has_acpi_build = false;@@ -272,6 +277,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,16 +355,24 @@ 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_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS +#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_1_7_MACHINE_OPTIONSstatic QEMUMachine pc_i440fx_machine_v1_6 = {PC_I440FX_1_6_MACHINE_OPTIONS ,@@ -752,6 +771,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 +24
-3@@ -222,8 +222,13 @@ static void pc_q35_init(QEMUMachineInitArgs *args) } } +static void pc_compat_1_7 (QEMUMachineInitArgs *args) +{ +} +static void pc_compat_1_6 (QEMUMachineInitArgs *args) { +pc_compat_1_7 (args); has_pci_info = false; rom_file_in_ram = false; has_acpi_build = false;@@ -243,6 +248,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 +277,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_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS +#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_1_8_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 +333,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);
Quoted 13 lines · Paolo Bonzini
Il 08/12/2013 12:21, Michael S. Tsirkin ha scritto:
Quoted 12 lines · Paolo Bonzini
Quoted 11 lines
Il 14/11/2013 11:37, Michael S. Tsirkin ha scritto:
Quoted 4 lines
Several changes that affect compatibility between 1.8 and 1.7 are already planned, so we need pc compat structures in place.
Signed-off-by Michael S. Tsirkin <[email protected]>Is this patch in any tree? Also, you mentioned you would pick up Marcelo's 1GB alignment patch.
Thanks,
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Paolo
Both are in my PCI tree.
git://github.com/mstsirkin/qemu.gitdoesn't have it, are you missing a push?Paolo
My tree is here:git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git pci
Quoted 148 lines
Quoted 148 lines
Quoted 146 lines
Quoted 146 lines
Changes from v1:
make 1.6 call 1.7 as suggested by Paolohw/i386/pc_piix.c | 30 +++++++++++++++++++++++++----- hw/i386/pc_q35.c | 27 ++++++++++++++++++++++++--- 2 files changed, 49 insertions(+), 8 deletions(-)hw/i386/pc_piix.c +25
-5@@ -238,8 +238,13 @@ 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) { +pc_compat_1_6 (args); has_pci_info = false; rom_file_in_ram = false; has_acpi_build = false;@@ -272,6 +277,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,16 +355,24 @@ 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_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS +#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_1_7_MACHINE_OPTIONSstatic QEMUMachine pc_i440fx_machine_v1_6 = {PC_I440FX_1_6_MACHINE_OPTIONS ,@@ -752,6 +771,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 +24
-3@@ -222,8 +222,13 @@ static void pc_q35_init(QEMUMachineInitArgs *args) } } +static void pc_compat_1_7 (QEMUMachineInitArgs *args) +{ +} +static void pc_compat_1_6 (QEMUMachineInitArgs *args) { +pc_compat_1_7 (args); has_pci_info = false; rom_file_in_ram = false; has_acpi_build = false;@@ -243,6 +248,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 +277,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_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS +#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_1_8_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 +333,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);
Il 09/12/2013 11:24, Michael S. Tsirkin ha scritto:
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Both are in my PCI tree.
git://github.com/mstsirkin/qemu.gitdoesn't have it, are you missing a push?My tree is here:
git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.gitpci
Thanks. Can you please add it to MAINTAINERS?
You still need to change 1.8 to 2.0 in the patch.
Paolo
Quoted 5 lines · Paolo Bonzini
Il 09/12/2013 11:24, Michael S. Tsirkin ha scritto:
Quoted 4 lines
Quoted 3 lines
Quoted 1 line
Both are in my PCI tree.
git://github.com/mstsirkin/qemu.gitdoesn't have it, are you missing a push?
Quoted 8 lines
Quoted 2 lines
My tree is here:
git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.gitpciThanks. Can you please add it to
MAINTAINERS?You still need to change 1.8 to 2.0 in the patch.
Paolo
Will do. Thanks!
Quoted 11 lines · Paolo Bonzini
Il 09/12/2013 11:24, Michael S. Tsirkin ha scritto:
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Both are in my PCI tree.
git://github.com/mstsirkin/qemu.gitdoesn't have it, are you missing a push?My tree is here:
git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.gitpciThanks. Can you please add it to
MAINTAINERS?You still need to change 1.8 to 2.0 in the patch.
We have 2.0 machine types meanwhile (seabios update brought them in as we can use the big bios for 2.0 only).
cheers,
Gerd