Message ID | 20181221090410.27250-14-marcandre.lureau@redhat.com |
---|---|
State | New |
Headers | show |
Series | Generalize machine compatibility properties | expand |
On Fri, 21 Dec 2018 13:03:55 +0400 Marc-André Lureau <marcandre.lureau@redhat.com> wrote: > Use static arrays instead. > > Suggested-by: Eduardo Habkost <ehabkost@redhat.com> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > include/hw/boards.h | 3 +++ > include/hw/compat.h | 23 ----------------------- > include/hw/i386/pc.h | 34 ++-------------------------------- > hw/arm/virt.c | 5 +---- > hw/core/machine.c | 25 +++++++++++++++++++++++++ > hw/i386/pc.c | 34 ++++++++++++++++++++++++++++++++++ > hw/i386/pc_piix.c | 7 ++----- > hw/i386/pc_q35.c | 7 ++----- > hw/ppc/spapr.c | 2 +- > hw/s390x/s390-virtio-ccw.c | 5 +---- > 10 files changed, 71 insertions(+), 74 deletions(-) Reviewed-by: Cornelia Huck <cohuck@redhat.com>
On Fri, 21 Dec 2018 13:03:55 +0400 Marc-André Lureau <marcandre.lureau@redhat.com> wrote: > Use static arrays instead. > > Suggested-by: Eduardo Habkost <ehabkost@redhat.com> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > include/hw/boards.h | 3 +++ > include/hw/compat.h | 23 ----------------------- > include/hw/i386/pc.h | 34 ++-------------------------------- > hw/arm/virt.c | 5 +---- > hw/core/machine.c | 25 +++++++++++++++++++++++++ > hw/i386/pc.c | 34 ++++++++++++++++++++++++++++++++++ > hw/i386/pc_piix.c | 7 ++----- > hw/i386/pc_q35.c | 7 ++----- > hw/ppc/spapr.c | 2 +- > hw/s390x/s390-virtio-ccw.c | 5 +---- > 10 files changed, 71 insertions(+), 74 deletions(-) > > diff --git a/include/hw/boards.h b/include/hw/boards.h > index f8aa034d0e..611b34b26a 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -308,4 +308,7 @@ extern const size_t hw_compat_2_9_len; > extern GlobalProperty hw_compat_2_8[]; > extern const size_t hw_compat_2_8_len; > > +extern GlobalProperty hw_compat_2_7[]; > +extern const size_t hw_compat_2_7_len; > + > #endif > diff --git a/include/hw/compat.h b/include/hw/compat.h > index 65d6748054..7ceab17401 100644 > --- a/include/hw/compat.h > +++ b/include/hw/compat.h > @@ -1,29 +1,6 @@ > #ifndef HW_COMPAT_H > #define HW_COMPAT_H > > -#define HW_COMPAT_2_7 \ > - {\ > - .driver = "virtio-pci",\ > - .property = "page-per-vq",\ > - .value = "on",\ > - },{\ > - .driver = "virtio-serial-device",\ > - .property = "emergency-write",\ > - .value = "off",\ > - },{\ > - .driver = "ioapic",\ > - .property = "version",\ > - .value = "0x11",\ > - },{\ > - .driver = "intel-iommu",\ > - .property = "x-buggy-eim",\ > - .value = "true",\ > - },{\ > - .driver = "virtio-pci",\ > - .property = "x-ignore-backend-features",\ > - .value = "on",\ > - }, > - > #define HW_COMPAT_2_6 \ > {\ > .driver = "virtio-mmio",\ > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 12c47d2506..504fbc79a9 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -315,38 +315,8 @@ extern const size_t pc_compat_2_9_len; > extern GlobalProperty pc_compat_2_8[]; > extern const size_t pc_compat_2_8_len; > > -#define PC_COMPAT_2_7 \ > - HW_COMPAT_2_7 \ > - {\ > - .driver = TYPE_X86_CPU,\ > - .property = "l3-cache",\ > - .value = "off",\ > - },\ > - {\ > - .driver = TYPE_X86_CPU,\ > - .property = "full-cpuid-auto-level",\ > - .value = "off",\ > - },\ > - {\ > - .driver = "Opteron_G3" "-" TYPE_X86_CPU,\ > - .property = "family",\ > - .value = "15",\ > - },\ > - {\ > - .driver = "Opteron_G3" "-" TYPE_X86_CPU,\ > - .property = "model",\ > - .value = "6",\ > - },\ > - {\ > - .driver = "Opteron_G3" "-" TYPE_X86_CPU,\ > - .property = "stepping",\ > - .value = "1",\ > - },\ > - {\ > - .driver = "isa-pcspk",\ > - .property = "migrate",\ > - .value = "off",\ > - }, > +extern GlobalProperty pc_compat_2_7[]; > +extern const size_t pc_compat_2_7_len; > > #define PC_COMPAT_2_6 \ > HW_COMPAT_2_6 \ > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 850a02cf43..e01d19e5e1 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1939,12 +1939,9 @@ DEFINE_VIRT_MACHINE(2, 8) > static void virt_machine_2_7_options(MachineClass *mc) > { > VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); > - static GlobalProperty compat[] = { > - HW_COMPAT_2_7 > - }; > > virt_machine_2_8_options(mc); > - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); > + compat_props_add(mc->compat_props, hw_compat_2_7, hw_compat_2_7_len); > /* ITS was introduced with 2.8 */ > vmc->no_its = true; > /* Stick with 1K pages for migration compatibility */ > diff --git a/hw/core/machine.c b/hw/core/machine.c > index b3ea5bd777..92f4c71354 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -158,6 +158,31 @@ GlobalProperty hw_compat_2_8[] = { > }; > const size_t hw_compat_2_8_len = G_N_ELEMENTS(hw_compat_2_8); > > +GlobalProperty hw_compat_2_7[] = { > + { > + .driver = "virtio-pci", > + .property = "page-per-vq", > + .value = "on", > + },{ > + .driver = "virtio-serial-device", > + .property = "emergency-write", > + .value = "off", > + },{ > + .driver = "ioapic", > + .property = "version", > + .value = "0x11", > + },{ > + .driver = "intel-iommu", > + .property = "x-buggy-eim", > + .value = "true", > + },{ > + .driver = "virtio-pci", > + .property = "x-ignore-backend-features", > + .value = "on", > + }, > +}; > +const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7); > + > static char *machine_get_accel(Object *obj, Error **errp) > { > MachineState *ms = MACHINE(obj); > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 517ead567c..96c64ccc4f 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -218,6 +218,40 @@ GlobalProperty pc_compat_2_8[] = { > }; > const size_t pc_compat_2_8_len = G_N_ELEMENTS(pc_compat_2_8); > > +GlobalProperty pc_compat_2_7[] = { > + { > + .driver = TYPE_X86_CPU, > + .property = "l3-cache", > + .value = "off", > + }, > + { > + .driver = TYPE_X86_CPU, > + .property = "full-cpuid-auto-level", > + .value = "off", > + }, > + { > + .driver = "Opteron_G3" "-" TYPE_X86_CPU, > + .property = "family", > + .value = "15", > + }, > + { > + .driver = "Opteron_G3" "-" TYPE_X86_CPU, > + .property = "model", > + .value = "6", > + }, > + { > + .driver = "Opteron_G3" "-" TYPE_X86_CPU, > + .property = "stepping", > + .value = "1", > + }, > + { > + .driver = "isa-pcspk", > + .property = "migrate", > + .value = "off", > + }, > +}; > +const size_t pc_compat_2_7_len = G_N_ELEMENTS(pc_compat_2_7); > + > void gsi_handler(void *opaque, int n, int level) > { > GSIState *s = opaque; > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index deb5500624..b956b4abe0 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -514,12 +514,9 @@ DEFINE_I440FX_MACHINE(v2_8, "pc-i440fx-2.8", NULL, > > static void pc_i440fx_2_7_machine_options(MachineClass *m) > { > - static GlobalProperty compat[] = { > - PC_COMPAT_2_7 > - }; > - > pc_i440fx_2_8_machine_options(m); > - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); > + compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len); > + compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len); > } > > DEFINE_I440FX_MACHINE(v2_7, "pc-i440fx-2.7", NULL, > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 57b46e1ecb..e321f14cb5 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -398,13 +398,10 @@ DEFINE_Q35_MACHINE(v2_8, "pc-q35-2.8", NULL, > > static void pc_q35_2_7_machine_options(MachineClass *m) > { > - static GlobalProperty compat[] = { > - PC_COMPAT_2_7 > - }; > - > pc_q35_2_8_machine_options(m); > m->max_cpus = 255; > - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); > + compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len); > + compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len); > } > > DEFINE_Q35_MACHINE(v2_7, "pc-q35-2.7", NULL, > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index d2e46362fb..445996c0b4 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4164,7 +4164,6 @@ static void spapr_machine_2_7_class_options(MachineClass *mc) > { > sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc); > static GlobalProperty compat[] = { > - HW_COMPAT_2_7 > { > .driver = TYPE_SPAPR_PCI_HOST_BRIDGE, > .property = "mem_win_size", > @@ -4190,6 +4189,7 @@ static void spapr_machine_2_7_class_options(MachineClass *mc) > spapr_machine_2_8_class_options(mc); > mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power7_v2.3"); > mc->default_machine_opts = "modern-hotplug-events=off"; > + compat_props_add(mc->compat_props, hw_compat_2_7, hw_compat_2_7_len); > compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); > smc->phb_placement = phb_placement_2_7; > } > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 22e96ab353..f28feedd4b 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -795,13 +795,10 @@ static void ccw_machine_2_7_instance_options(MachineState *machine) > static void ccw_machine_2_7_class_options(MachineClass *mc) > { > S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc); > - static GlobalProperty compat[] = { > - HW_COMPAT_2_7 > - }; > > s390mc->cpu_model_allowed = false; > ccw_machine_2_8_class_options(mc); > - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); > + compat_props_add(mc->compat_props, hw_compat_2_7, hw_compat_2_7_len); > } > DEFINE_CCW_MACHINE(2_7, "2.7", false); >
diff --git a/include/hw/boards.h b/include/hw/boards.h index f8aa034d0e..611b34b26a 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -308,4 +308,7 @@ extern const size_t hw_compat_2_9_len; extern GlobalProperty hw_compat_2_8[]; extern const size_t hw_compat_2_8_len; +extern GlobalProperty hw_compat_2_7[]; +extern const size_t hw_compat_2_7_len; + #endif diff --git a/include/hw/compat.h b/include/hw/compat.h index 65d6748054..7ceab17401 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -1,29 +1,6 @@ #ifndef HW_COMPAT_H #define HW_COMPAT_H -#define HW_COMPAT_2_7 \ - {\ - .driver = "virtio-pci",\ - .property = "page-per-vq",\ - .value = "on",\ - },{\ - .driver = "virtio-serial-device",\ - .property = "emergency-write",\ - .value = "off",\ - },{\ - .driver = "ioapic",\ - .property = "version",\ - .value = "0x11",\ - },{\ - .driver = "intel-iommu",\ - .property = "x-buggy-eim",\ - .value = "true",\ - },{\ - .driver = "virtio-pci",\ - .property = "x-ignore-backend-features",\ - .value = "on",\ - }, - #define HW_COMPAT_2_6 \ {\ .driver = "virtio-mmio",\ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 12c47d2506..504fbc79a9 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -315,38 +315,8 @@ extern const size_t pc_compat_2_9_len; extern GlobalProperty pc_compat_2_8[]; extern const size_t pc_compat_2_8_len; -#define PC_COMPAT_2_7 \ - HW_COMPAT_2_7 \ - {\ - .driver = TYPE_X86_CPU,\ - .property = "l3-cache",\ - .value = "off",\ - },\ - {\ - .driver = TYPE_X86_CPU,\ - .property = "full-cpuid-auto-level",\ - .value = "off",\ - },\ - {\ - .driver = "Opteron_G3" "-" TYPE_X86_CPU,\ - .property = "family",\ - .value = "15",\ - },\ - {\ - .driver = "Opteron_G3" "-" TYPE_X86_CPU,\ - .property = "model",\ - .value = "6",\ - },\ - {\ - .driver = "Opteron_G3" "-" TYPE_X86_CPU,\ - .property = "stepping",\ - .value = "1",\ - },\ - {\ - .driver = "isa-pcspk",\ - .property = "migrate",\ - .value = "off",\ - }, +extern GlobalProperty pc_compat_2_7[]; +extern const size_t pc_compat_2_7_len; #define PC_COMPAT_2_6 \ HW_COMPAT_2_6 \ diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 850a02cf43..e01d19e5e1 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1939,12 +1939,9 @@ DEFINE_VIRT_MACHINE(2, 8) static void virt_machine_2_7_options(MachineClass *mc) { VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); - static GlobalProperty compat[] = { - HW_COMPAT_2_7 - }; virt_machine_2_8_options(mc); - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); + compat_props_add(mc->compat_props, hw_compat_2_7, hw_compat_2_7_len); /* ITS was introduced with 2.8 */ vmc->no_its = true; /* Stick with 1K pages for migration compatibility */ diff --git a/hw/core/machine.c b/hw/core/machine.c index b3ea5bd777..92f4c71354 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -158,6 +158,31 @@ GlobalProperty hw_compat_2_8[] = { }; const size_t hw_compat_2_8_len = G_N_ELEMENTS(hw_compat_2_8); +GlobalProperty hw_compat_2_7[] = { + { + .driver = "virtio-pci", + .property = "page-per-vq", + .value = "on", + },{ + .driver = "virtio-serial-device", + .property = "emergency-write", + .value = "off", + },{ + .driver = "ioapic", + .property = "version", + .value = "0x11", + },{ + .driver = "intel-iommu", + .property = "x-buggy-eim", + .value = "true", + },{ + .driver = "virtio-pci", + .property = "x-ignore-backend-features", + .value = "on", + }, +}; +const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7); + static char *machine_get_accel(Object *obj, Error **errp) { MachineState *ms = MACHINE(obj); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 517ead567c..96c64ccc4f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -218,6 +218,40 @@ GlobalProperty pc_compat_2_8[] = { }; const size_t pc_compat_2_8_len = G_N_ELEMENTS(pc_compat_2_8); +GlobalProperty pc_compat_2_7[] = { + { + .driver = TYPE_X86_CPU, + .property = "l3-cache", + .value = "off", + }, + { + .driver = TYPE_X86_CPU, + .property = "full-cpuid-auto-level", + .value = "off", + }, + { + .driver = "Opteron_G3" "-" TYPE_X86_CPU, + .property = "family", + .value = "15", + }, + { + .driver = "Opteron_G3" "-" TYPE_X86_CPU, + .property = "model", + .value = "6", + }, + { + .driver = "Opteron_G3" "-" TYPE_X86_CPU, + .property = "stepping", + .value = "1", + }, + { + .driver = "isa-pcspk", + .property = "migrate", + .value = "off", + }, +}; +const size_t pc_compat_2_7_len = G_N_ELEMENTS(pc_compat_2_7); + void gsi_handler(void *opaque, int n, int level) { GSIState *s = opaque; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index deb5500624..b956b4abe0 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -514,12 +514,9 @@ DEFINE_I440FX_MACHINE(v2_8, "pc-i440fx-2.8", NULL, static void pc_i440fx_2_7_machine_options(MachineClass *m) { - static GlobalProperty compat[] = { - PC_COMPAT_2_7 - }; - pc_i440fx_2_8_machine_options(m); - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); + compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len); + compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len); } DEFINE_I440FX_MACHINE(v2_7, "pc-i440fx-2.7", NULL, diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 57b46e1ecb..e321f14cb5 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -398,13 +398,10 @@ DEFINE_Q35_MACHINE(v2_8, "pc-q35-2.8", NULL, static void pc_q35_2_7_machine_options(MachineClass *m) { - static GlobalProperty compat[] = { - PC_COMPAT_2_7 - }; - pc_q35_2_8_machine_options(m); m->max_cpus = 255; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); + compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len); + compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len); } DEFINE_Q35_MACHINE(v2_7, "pc-q35-2.7", NULL, diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index d2e46362fb..445996c0b4 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4164,7 +4164,6 @@ static void spapr_machine_2_7_class_options(MachineClass *mc) { sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc); static GlobalProperty compat[] = { - HW_COMPAT_2_7 { .driver = TYPE_SPAPR_PCI_HOST_BRIDGE, .property = "mem_win_size", @@ -4190,6 +4189,7 @@ static void spapr_machine_2_7_class_options(MachineClass *mc) spapr_machine_2_8_class_options(mc); mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power7_v2.3"); mc->default_machine_opts = "modern-hotplug-events=off"; + compat_props_add(mc->compat_props, hw_compat_2_7, hw_compat_2_7_len); compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); smc->phb_placement = phb_placement_2_7; } diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 22e96ab353..f28feedd4b 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -795,13 +795,10 @@ static void ccw_machine_2_7_instance_options(MachineState *machine) static void ccw_machine_2_7_class_options(MachineClass *mc) { S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc); - static GlobalProperty compat[] = { - HW_COMPAT_2_7 - }; s390mc->cpu_model_allowed = false; ccw_machine_2_8_class_options(mc); - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); + compat_props_add(mc->compat_props, hw_compat_2_7, hw_compat_2_7_len); } DEFINE_CCW_MACHINE(2_7, "2.7", false);
Use static arrays instead. Suggested-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- include/hw/boards.h | 3 +++ include/hw/compat.h | 23 ----------------------- include/hw/i386/pc.h | 34 ++-------------------------------- hw/arm/virt.c | 5 +---- hw/core/machine.c | 25 +++++++++++++++++++++++++ hw/i386/pc.c | 34 ++++++++++++++++++++++++++++++++++ hw/i386/pc_piix.c | 7 ++----- hw/i386/pc_q35.c | 7 ++----- hw/ppc/spapr.c | 2 +- hw/s390x/s390-virtio-ccw.c | 5 +---- 10 files changed, 71 insertions(+), 74 deletions(-)