Message ID | 20181221090410.27250-17-marcandre.lureau@redhat.com |
---|---|
State | New |
Headers | show |
Series | Generalize machine compatibility properties | expand |
On Fri, 21 Dec 2018 13:03:58 +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 | 27 -------------- > include/hw/i386/pc.h | 74 ++------------------------------------ > hw/core/machine.c | 29 +++++++++++++++ > hw/i386/pc.c | 71 ++++++++++++++++++++++++++++++++++++ > hw/i386/pc_piix.c | 6 ++-- > hw/i386/pc_q35.c | 6 ++-- > hw/ppc/spapr.c | 5 +-- > hw/s390x/s390-virtio-ccw.c | 2 +- > 9 files changed, 112 insertions(+), 111 deletions(-) Reviewed-by: Cornelia Huck <cohuck@redhat.com>
On Fri, 21 Dec 2018 13:03:58 +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 | 27 -------------- > include/hw/i386/pc.h | 74 ++------------------------------------ > hw/core/machine.c | 29 +++++++++++++++ > hw/i386/pc.c | 71 ++++++++++++++++++++++++++++++++++++ > hw/i386/pc_piix.c | 6 ++-- > hw/i386/pc_q35.c | 6 ++-- > hw/ppc/spapr.c | 5 +-- > hw/s390x/s390-virtio-ccw.c | 2 +- > 9 files changed, 112 insertions(+), 111 deletions(-) > > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 36e1269eb1..053e362f28 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -317,4 +317,7 @@ extern const size_t hw_compat_2_6_len; > extern GlobalProperty hw_compat_2_5[]; > extern const size_t hw_compat_2_5_len; > > +extern GlobalProperty hw_compat_2_4[]; > +extern const size_t hw_compat_2_4_len; > + > #endif > diff --git a/include/hw/compat.h b/include/hw/compat.h > index a6eced34c6..05ff05e159 100644 > --- a/include/hw/compat.h > +++ b/include/hw/compat.h > @@ -1,33 +1,6 @@ > #ifndef HW_COMPAT_H > #define HW_COMPAT_H > > -#define HW_COMPAT_2_4 \ > - {\ > - .driver = "virtio-blk-device",\ > - .property = "scsi",\ > - .value = "true",\ > - },{\ > - .driver = "e1000",\ > - .property = "extra_mac_registers",\ > - .value = "off",\ > - },{\ > - .driver = "virtio-pci",\ > - .property = "x-disable-pcie",\ > - .value = "on",\ > - },{\ > - .driver = "virtio-pci",\ > - .property = "migrate-extra",\ > - .value = "off",\ > - },{\ > - .driver = "fw_cfg_mem",\ > - .property = "dma_enabled",\ > - .value = "off",\ > - },{\ > - .driver = "fw_cfg_io",\ > - .property = "dma_enabled",\ > - .value = "off",\ > - }, > - > #define HW_COMPAT_2_3 \ > {\ > .driver = "virtio-blk-pci",\ > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 9a32031f25..a9045f6bea 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -324,6 +324,9 @@ extern const size_t pc_compat_2_6_len; > extern GlobalProperty pc_compat_2_5[]; > extern const size_t pc_compat_2_5_len; > > +extern GlobalProperty pc_compat_2_4[]; > +extern const size_t pc_compat_2_4_len; > + > /* Helper for setting model-id for CPU models that changed model-id > * depending on QEMU versions up to QEMU 2.4. > */ > @@ -344,77 +347,6 @@ extern const size_t pc_compat_2_5_len; > .value = "QEMU Virtual CPU version " v,\ > }, > > -#define PC_COMPAT_2_4 \ > - HW_COMPAT_2_4 \ > - PC_CPU_MODEL_IDS("2.4.0") \ > - {\ > - .driver = "Haswell-" TYPE_X86_CPU,\ > - .property = "abm",\ > - .value = "off",\ > - },\ > - {\ > - .driver = "Haswell-noTSX-" TYPE_X86_CPU,\ > - .property = "abm",\ > - .value = "off",\ > - },\ > - {\ > - .driver = "Broadwell-" TYPE_X86_CPU,\ > - .property = "abm",\ > - .value = "off",\ > - },\ > - {\ > - .driver = "Broadwell-noTSX-" TYPE_X86_CPU,\ > - .property = "abm",\ > - .value = "off",\ > - },\ > - {\ > - .driver = "host" "-" TYPE_X86_CPU,\ > - .property = "host-cache-info",\ > - .value = "on",\ > - },\ > - {\ > - .driver = TYPE_X86_CPU,\ > - .property = "check",\ > - .value = "off",\ > - },\ > - {\ > - .driver = "qemu64" "-" TYPE_X86_CPU,\ > - .property = "sse4a",\ > - .value = "on",\ > - },\ > - {\ > - .driver = "qemu64" "-" TYPE_X86_CPU,\ > - .property = "abm",\ > - .value = "on",\ > - },\ > - {\ > - .driver = "qemu64" "-" TYPE_X86_CPU,\ > - .property = "popcnt",\ > - .value = "on",\ > - },\ > - {\ > - .driver = "qemu32" "-" TYPE_X86_CPU,\ > - .property = "popcnt",\ > - .value = "on",\ > - },{\ > - .driver = "Opteron_G2" "-" TYPE_X86_CPU,\ > - .property = "rdtscp",\ > - .value = "on",\ > - },{\ > - .driver = "Opteron_G3" "-" TYPE_X86_CPU,\ > - .property = "rdtscp",\ > - .value = "on",\ > - },{\ > - .driver = "Opteron_G4" "-" TYPE_X86_CPU,\ > - .property = "rdtscp",\ > - .value = "on",\ > - },{\ > - .driver = "Opteron_G5" "-" TYPE_X86_CPU,\ > - .property = "rdtscp",\ > - .value = "on",\ > - }, > - > - > #define PC_COMPAT_2_3 \ > HW_COMPAT_2_3 \ > PC_CPU_MODEL_IDS("2.3.0") \ > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 1022b538a5..a14e343cba 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -226,6 +226,35 @@ GlobalProperty hw_compat_2_5[] = { > }; > const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5); > > +GlobalProperty hw_compat_2_4[] = { > + { > + .driver = "virtio-blk-device", > + .property = "scsi", > + .value = "true", > + },{ > + .driver = "e1000", > + .property = "extra_mac_registers", > + .value = "off", > + },{ > + .driver = "virtio-pci", > + .property = "x-disable-pcie", > + .value = "on", > + },{ > + .driver = "virtio-pci", > + .property = "migrate-extra", > + .value = "off", > + },{ > + .driver = "fw_cfg_mem", > + .property = "dma_enabled", > + .value = "off", > + },{ > + .driver = "fw_cfg_io", > + .property = "dma_enabled", > + .value = "off", > + } > +}; > +const size_t hw_compat_2_4_len = G_N_ELEMENTS(hw_compat_2_4); > + > 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 ac54c2e39d..ed40071f66 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -278,6 +278,77 @@ const size_t pc_compat_2_6_len = G_N_ELEMENTS(pc_compat_2_6); > GlobalProperty pc_compat_2_5[] = {}; > const size_t pc_compat_2_5_len = G_N_ELEMENTS(pc_compat_2_5); > > +GlobalProperty pc_compat_2_4[] = { > + PC_CPU_MODEL_IDS("2.4.0") > + { > + .driver = "Haswell-" TYPE_X86_CPU, > + .property = "abm", > + .value = "off", > + }, > + { > + .driver = "Haswell-noTSX-" TYPE_X86_CPU, > + .property = "abm", > + .value = "off", > + }, > + { > + .driver = "Broadwell-" TYPE_X86_CPU, > + .property = "abm", > + .value = "off", > + }, > + { > + .driver = "Broadwell-noTSX-" TYPE_X86_CPU, > + .property = "abm", > + .value = "off", > + }, > + { > + .driver = "host" "-" TYPE_X86_CPU, > + .property = "host-cache-info", > + .value = "on", > + }, > + { > + .driver = TYPE_X86_CPU, > + .property = "check", > + .value = "off", > + }, > + { > + .driver = "qemu64" "-" TYPE_X86_CPU, > + .property = "sse4a", > + .value = "on", > + }, > + { > + .driver = "qemu64" "-" TYPE_X86_CPU, > + .property = "abm", > + .value = "on", > + }, > + { > + .driver = "qemu64" "-" TYPE_X86_CPU, > + .property = "popcnt", > + .value = "on", > + }, > + { > + .driver = "qemu32" "-" TYPE_X86_CPU, > + .property = "popcnt", > + .value = "on", > + },{ > + .driver = "Opteron_G2" "-" TYPE_X86_CPU, > + .property = "rdtscp", > + .value = "on", > + },{ > + .driver = "Opteron_G3" "-" TYPE_X86_CPU, > + .property = "rdtscp", > + .value = "on", > + },{ > + .driver = "Opteron_G4" "-" TYPE_X86_CPU, > + .property = "rdtscp", > + .value = "on", > + },{ > + .driver = "Opteron_G5" "-" TYPE_X86_CPU, > + .property = "rdtscp", > + .value = "on", > + } > +}; > +const size_t pc_compat_2_4_len = G_N_ELEMENTS(pc_compat_2_4); > + > 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 4f5168534a..1465d367d1 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -553,14 +553,12 @@ DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL, > static void pc_i440fx_2_4_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > - static GlobalProperty compat[] = { > - PC_COMPAT_2_4 > - }; > > pc_i440fx_2_5_machine_options(m); > m->hw_version = "2.4.0"; > pcmc->broken_reserved_end = true; > - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); > + compat_props_add(m->compat_props, hw_compat_2_4, hw_compat_2_4_len); > + compat_props_add(m->compat_props, pc_compat_2_4, pc_compat_2_4_len); > } > > DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL, > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index a33d5d3610..418a6f9b8f 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -438,14 +438,12 @@ DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL, > static void pc_q35_2_4_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > - static GlobalProperty compat[] = { > - PC_COMPAT_2_4 > - }; > > pc_q35_2_5_machine_options(m); > m->hw_version = "2.4.0"; > pcmc->broken_reserved_end = true; > - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); > + compat_props_add(m->compat_props, hw_compat_2_4, hw_compat_2_4_len); > + compat_props_add(m->compat_props, pc_compat_2_4, pc_compat_2_4_len); > } > > DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL, > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index c808ec90f0..9ab8484579 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4248,13 +4248,10 @@ DEFINE_SPAPR_MACHINE(2_5, "2.5", false); > static void spapr_machine_2_4_class_options(MachineClass *mc) > { > sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc); > - static GlobalProperty compat[] = { > - HW_COMPAT_2_4 > - }; > > spapr_machine_2_5_class_options(mc); > smc->dr_lmb_enabled = false; > - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); > + compat_props_add(mc->compat_props, hw_compat_2_4, hw_compat_2_4_len); > } > > DEFINE_SPAPR_MACHINE(2_4, "2.4", false); > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 1ab53a1332..bf5f2f463c 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -849,7 +849,6 @@ static void ccw_machine_2_4_instance_options(MachineState *machine) > static void ccw_machine_2_4_class_options(MachineClass *mc) > { > static GlobalProperty compat[] = { > - HW_COMPAT_2_4 > { > .driver = TYPE_S390_SKEYS, > .property = "migration-enabled", > @@ -890,6 +889,7 @@ static void ccw_machine_2_4_class_options(MachineClass *mc) > }; > > ccw_machine_2_5_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_2_4, hw_compat_2_4_len); > compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); > } > DEFINE_CCW_MACHINE(2_4, "2.4", false);
diff --git a/include/hw/boards.h b/include/hw/boards.h index 36e1269eb1..053e362f28 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -317,4 +317,7 @@ extern const size_t hw_compat_2_6_len; extern GlobalProperty hw_compat_2_5[]; extern const size_t hw_compat_2_5_len; +extern GlobalProperty hw_compat_2_4[]; +extern const size_t hw_compat_2_4_len; + #endif diff --git a/include/hw/compat.h b/include/hw/compat.h index a6eced34c6..05ff05e159 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -1,33 +1,6 @@ #ifndef HW_COMPAT_H #define HW_COMPAT_H -#define HW_COMPAT_2_4 \ - {\ - .driver = "virtio-blk-device",\ - .property = "scsi",\ - .value = "true",\ - },{\ - .driver = "e1000",\ - .property = "extra_mac_registers",\ - .value = "off",\ - },{\ - .driver = "virtio-pci",\ - .property = "x-disable-pcie",\ - .value = "on",\ - },{\ - .driver = "virtio-pci",\ - .property = "migrate-extra",\ - .value = "off",\ - },{\ - .driver = "fw_cfg_mem",\ - .property = "dma_enabled",\ - .value = "off",\ - },{\ - .driver = "fw_cfg_io",\ - .property = "dma_enabled",\ - .value = "off",\ - }, - #define HW_COMPAT_2_3 \ {\ .driver = "virtio-blk-pci",\ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9a32031f25..a9045f6bea 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -324,6 +324,9 @@ extern const size_t pc_compat_2_6_len; extern GlobalProperty pc_compat_2_5[]; extern const size_t pc_compat_2_5_len; +extern GlobalProperty pc_compat_2_4[]; +extern const size_t pc_compat_2_4_len; + /* Helper for setting model-id for CPU models that changed model-id * depending on QEMU versions up to QEMU 2.4. */ @@ -344,77 +347,6 @@ extern const size_t pc_compat_2_5_len; .value = "QEMU Virtual CPU version " v,\ }, -#define PC_COMPAT_2_4 \ - HW_COMPAT_2_4 \ - PC_CPU_MODEL_IDS("2.4.0") \ - {\ - .driver = "Haswell-" TYPE_X86_CPU,\ - .property = "abm",\ - .value = "off",\ - },\ - {\ - .driver = "Haswell-noTSX-" TYPE_X86_CPU,\ - .property = "abm",\ - .value = "off",\ - },\ - {\ - .driver = "Broadwell-" TYPE_X86_CPU,\ - .property = "abm",\ - .value = "off",\ - },\ - {\ - .driver = "Broadwell-noTSX-" TYPE_X86_CPU,\ - .property = "abm",\ - .value = "off",\ - },\ - {\ - .driver = "host" "-" TYPE_X86_CPU,\ - .property = "host-cache-info",\ - .value = "on",\ - },\ - {\ - .driver = TYPE_X86_CPU,\ - .property = "check",\ - .value = "off",\ - },\ - {\ - .driver = "qemu64" "-" TYPE_X86_CPU,\ - .property = "sse4a",\ - .value = "on",\ - },\ - {\ - .driver = "qemu64" "-" TYPE_X86_CPU,\ - .property = "abm",\ - .value = "on",\ - },\ - {\ - .driver = "qemu64" "-" TYPE_X86_CPU,\ - .property = "popcnt",\ - .value = "on",\ - },\ - {\ - .driver = "qemu32" "-" TYPE_X86_CPU,\ - .property = "popcnt",\ - .value = "on",\ - },{\ - .driver = "Opteron_G2" "-" TYPE_X86_CPU,\ - .property = "rdtscp",\ - .value = "on",\ - },{\ - .driver = "Opteron_G3" "-" TYPE_X86_CPU,\ - .property = "rdtscp",\ - .value = "on",\ - },{\ - .driver = "Opteron_G4" "-" TYPE_X86_CPU,\ - .property = "rdtscp",\ - .value = "on",\ - },{\ - .driver = "Opteron_G5" "-" TYPE_X86_CPU,\ - .property = "rdtscp",\ - .value = "on",\ - }, - - #define PC_COMPAT_2_3 \ HW_COMPAT_2_3 \ PC_CPU_MODEL_IDS("2.3.0") \ diff --git a/hw/core/machine.c b/hw/core/machine.c index 1022b538a5..a14e343cba 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -226,6 +226,35 @@ GlobalProperty hw_compat_2_5[] = { }; const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5); +GlobalProperty hw_compat_2_4[] = { + { + .driver = "virtio-blk-device", + .property = "scsi", + .value = "true", + },{ + .driver = "e1000", + .property = "extra_mac_registers", + .value = "off", + },{ + .driver = "virtio-pci", + .property = "x-disable-pcie", + .value = "on", + },{ + .driver = "virtio-pci", + .property = "migrate-extra", + .value = "off", + },{ + .driver = "fw_cfg_mem", + .property = "dma_enabled", + .value = "off", + },{ + .driver = "fw_cfg_io", + .property = "dma_enabled", + .value = "off", + } +}; +const size_t hw_compat_2_4_len = G_N_ELEMENTS(hw_compat_2_4); + 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 ac54c2e39d..ed40071f66 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -278,6 +278,77 @@ const size_t pc_compat_2_6_len = G_N_ELEMENTS(pc_compat_2_6); GlobalProperty pc_compat_2_5[] = {}; const size_t pc_compat_2_5_len = G_N_ELEMENTS(pc_compat_2_5); +GlobalProperty pc_compat_2_4[] = { + PC_CPU_MODEL_IDS("2.4.0") + { + .driver = "Haswell-" TYPE_X86_CPU, + .property = "abm", + .value = "off", + }, + { + .driver = "Haswell-noTSX-" TYPE_X86_CPU, + .property = "abm", + .value = "off", + }, + { + .driver = "Broadwell-" TYPE_X86_CPU, + .property = "abm", + .value = "off", + }, + { + .driver = "Broadwell-noTSX-" TYPE_X86_CPU, + .property = "abm", + .value = "off", + }, + { + .driver = "host" "-" TYPE_X86_CPU, + .property = "host-cache-info", + .value = "on", + }, + { + .driver = TYPE_X86_CPU, + .property = "check", + .value = "off", + }, + { + .driver = "qemu64" "-" TYPE_X86_CPU, + .property = "sse4a", + .value = "on", + }, + { + .driver = "qemu64" "-" TYPE_X86_CPU, + .property = "abm", + .value = "on", + }, + { + .driver = "qemu64" "-" TYPE_X86_CPU, + .property = "popcnt", + .value = "on", + }, + { + .driver = "qemu32" "-" TYPE_X86_CPU, + .property = "popcnt", + .value = "on", + },{ + .driver = "Opteron_G2" "-" TYPE_X86_CPU, + .property = "rdtscp", + .value = "on", + },{ + .driver = "Opteron_G3" "-" TYPE_X86_CPU, + .property = "rdtscp", + .value = "on", + },{ + .driver = "Opteron_G4" "-" TYPE_X86_CPU, + .property = "rdtscp", + .value = "on", + },{ + .driver = "Opteron_G5" "-" TYPE_X86_CPU, + .property = "rdtscp", + .value = "on", + } +}; +const size_t pc_compat_2_4_len = G_N_ELEMENTS(pc_compat_2_4); + 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 4f5168534a..1465d367d1 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -553,14 +553,12 @@ DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL, static void pc_i440fx_2_4_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - static GlobalProperty compat[] = { - PC_COMPAT_2_4 - }; pc_i440fx_2_5_machine_options(m); m->hw_version = "2.4.0"; pcmc->broken_reserved_end = true; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); + compat_props_add(m->compat_props, hw_compat_2_4, hw_compat_2_4_len); + compat_props_add(m->compat_props, pc_compat_2_4, pc_compat_2_4_len); } DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL, diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index a33d5d3610..418a6f9b8f 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -438,14 +438,12 @@ DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL, static void pc_q35_2_4_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - static GlobalProperty compat[] = { - PC_COMPAT_2_4 - }; pc_q35_2_5_machine_options(m); m->hw_version = "2.4.0"; pcmc->broken_reserved_end = true; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); + compat_props_add(m->compat_props, hw_compat_2_4, hw_compat_2_4_len); + compat_props_add(m->compat_props, pc_compat_2_4, pc_compat_2_4_len); } DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL, diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c808ec90f0..9ab8484579 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4248,13 +4248,10 @@ DEFINE_SPAPR_MACHINE(2_5, "2.5", false); static void spapr_machine_2_4_class_options(MachineClass *mc) { sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc); - static GlobalProperty compat[] = { - HW_COMPAT_2_4 - }; spapr_machine_2_5_class_options(mc); smc->dr_lmb_enabled = false; - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); + compat_props_add(mc->compat_props, hw_compat_2_4, hw_compat_2_4_len); } DEFINE_SPAPR_MACHINE(2_4, "2.4", false); diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 1ab53a1332..bf5f2f463c 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -849,7 +849,6 @@ static void ccw_machine_2_4_instance_options(MachineState *machine) static void ccw_machine_2_4_class_options(MachineClass *mc) { static GlobalProperty compat[] = { - HW_COMPAT_2_4 { .driver = TYPE_S390_SKEYS, .property = "migration-enabled", @@ -890,6 +889,7 @@ static void ccw_machine_2_4_class_options(MachineClass *mc) }; ccw_machine_2_5_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_2_4, hw_compat_2_4_len); compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); } DEFINE_CCW_MACHINE(2_4, "2.4", 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 | 27 -------------- include/hw/i386/pc.h | 74 ++------------------------------------ hw/core/machine.c | 29 +++++++++++++++ hw/i386/pc.c | 71 ++++++++++++++++++++++++++++++++++++ hw/i386/pc_piix.c | 6 ++-- hw/i386/pc_q35.c | 6 ++-- hw/ppc/spapr.c | 5 +-- hw/s390x/s390-virtio-ccw.c | 2 +- 9 files changed, 112 insertions(+), 111 deletions(-)