| Message ID | 20190724103524.20916-1-cohuck@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [for-4.2] hw: add compat machines for 4.2 | expand |
On Wed, Jul 24, 2019 at 12:35:24PM +0200, Cornelia Huck wrote: > Add 4.2 machine types for arm/i440fx/q35/s390x/spapr. > > For i440fx and q35, unversioned cpu models are still translated > to -v1, as 0788a56bd1ae ("i386: Make unversioned CPU models be > aliases") states this should only transition to the latest cpu > model version in 4.3 (or later). > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> I plan to queue it for 4.2, but I think it's OK to queue this in parallel through other trees if necessary (so patches that depend on the new machine types can be queued too).
On 24.07.19 12:35, Cornelia Huck wrote: > Add 4.2 machine types for arm/i440fx/q35/s390x/spapr. > > For i440fx and q35, unversioned cpu models are still translated > to -v1, as 0788a56bd1ae ("i386: Make unversioned CPU models be > aliases") states this should only transition to the latest cpu > model version in 4.3 (or later). > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > --- > hw/arm/virt.c | 9 ++++++++- > hw/core/machine.c | 3 +++ > hw/i386/pc.c | 3 +++ > hw/i386/pc_piix.c | 14 +++++++++++++- > hw/i386/pc_q35.c | 13 ++++++++++++- > hw/ppc/spapr.c | 15 +++++++++++++-- > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- > include/hw/boards.h | 3 +++ > include/hw/i386/pc.h | 3 +++ > 9 files changed, 71 insertions(+), 6 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index d9496c936342..64e3fc34401a 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2046,10 +2046,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_4_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(4, 2) > + > static void virt_machine_4_1_options(MachineClass *mc) > { > + virt_machine_4_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(4, 1) > +DEFINE_VIRT_MACHINE(4, 1) > > static void virt_machine_4_0_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index c58a8e594efc..a79d4ad740a0 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -27,6 +27,9 @@ > #include "hw/pci/pci.h" > #include "hw/mem/nvdimm.h" > > +GlobalProperty hw_compat_4_1[] = {}; > +const size_t hw_compat_4_1_len = G_N_ELEMENTS(hw_compat_4_1); > + > GlobalProperty hw_compat_4_0[] = { > { "VGA", "edid", "false" }, > { "secondary-vga", "edid", "false" }, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 549c43705096..2aa1c49701dd 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -116,6 +116,9 @@ struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX}; > /* Physical Address of PVH entry point read from kernel ELF NOTE */ > static size_t pvh_start_addr; > > +GlobalProperty pc_compat_4_1[] = {}; > +const size_t pc_compat_4_1_len = G_N_ELEMENTS(pc_compat_4_1); > + > GlobalProperty pc_compat_4_0[] = {}; > const size_t pc_compat_4_0_len = G_N_ELEMENTS(pc_compat_4_0); > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index c2280c72effb..24e71be1d218 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -433,7 +433,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); > } > > -static void pc_i440fx_4_1_machine_options(MachineClass *m) > +static void pc_i440fx_4_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -442,6 +442,18 @@ static void pc_i440fx_4_1_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_I440FX_MACHINE(v4_2, "pc-i440fx-4.2", NULL, > + pc_i440fx_4_2_machine_options); > + > +static void pc_i440fx_4_1_machine_options(MachineClass *m) > +{ > + pc_i440fx_4_2_machine_options(m); > + m->alias = NULL; > + m->is_default = 0; > + compat_props_add(m->compat_props, hw_compat_4_1, hw_compat_4_1_len); > + compat_props_add(m->compat_props, pc_compat_4_1, pc_compat_4_1_len); > +} > + > DEFINE_I440FX_MACHINE(v4_1, "pc-i440fx-4.1", NULL, > pc_i440fx_4_1_machine_options); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 397e1fdd2f37..e61260762cdc 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -365,7 +365,7 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus = 288; > } > > -static void pc_q35_4_1_machine_options(MachineClass *m) > +static void pc_q35_4_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -373,6 +373,17 @@ static void pc_q35_4_1_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_Q35_MACHINE(v4_2, "pc-q35-4.2", NULL, > + pc_q35_4_2_machine_options); > + > +static void pc_q35_4_1_machine_options(MachineClass *m) > +{ > + pc_q35_4_2_machine_options(m); > + m->alias = NULL; > + compat_props_add(m->compat_props, hw_compat_4_1, hw_compat_4_1_len); > + compat_props_add(m->compat_props, pc_compat_4_1, pc_compat_4_1_len); > +} > + > DEFINE_Q35_MACHINE(v4_1, "pc-q35-4.1", NULL, > pc_q35_4_1_machine_options); > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 821f0d4a49ff..6c8aa6054508 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4426,15 +4426,26 @@ static const TypeInfo spapr_machine_info = { > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * pseries-4.2 > + */ > +static void spapr_machine_4_2_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(4_2, "4.2", true); > + > /* > * pseries-4.1 > */ > static void spapr_machine_4_1_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_4_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len); > } > > -DEFINE_SPAPR_MACHINE(4_1, "4.1", true); > +DEFINE_SPAPR_MACHINE(4_1, "4.1", false); > > /* > * pseries-4.0 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 5b6a9a4e5574..593b34e0e201 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -660,14 +660,26 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +static void ccw_machine_4_2_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_4_2_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(4_2, "4.2", true); > + > static void ccw_machine_4_1_instance_options(MachineState *machine) > { > + ccw_machine_4_2_instance_options(machine); > } > > static void ccw_machine_4_1_class_options(MachineClass *mc) > { > + ccw_machine_4_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len); > } > -DEFINE_CCW_MACHINE(4_1, "4.1", true); > +DEFINE_CCW_MACHINE(4_1, "4.1", false); > > static void ccw_machine_4_0_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index a71d1a53a5c0..d9ec37d80743 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -317,6 +317,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_4_1[]; > +extern const size_t hw_compat_4_1_len; > + > extern GlobalProperty hw_compat_4_0[]; > extern const size_t hw_compat_4_0_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 859b64c51d45..c840e392515b 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -302,6 +302,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); > int e820_get_num_entries(void); > bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); > > +extern GlobalProperty pc_compat_4_1[]; > +extern const size_t pc_compat_4_1_len; > + > extern GlobalProperty pc_compat_4_0[]; > extern const size_t pc_compat_4_0_len; > > s390x bits Reviewed-by: David Hildenbrand <david@redhat.com>
On Wed, 24 Jul 2019 12:35:24 +0200 Cornelia Huck <cohuck@redhat.com> wrote: > Add 4.2 machine types for arm/i440fx/q35/s390x/spapr. > > For i440fx and q35, unversioned cpu models are still translated > to -v1, as 0788a56bd1ae ("i386: Make unversioned CPU models be > aliases") states this should only transition to the latest cpu > model version in 4.3 (or later). > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > --- > hw/arm/virt.c | 9 ++++++++- > hw/core/machine.c | 3 +++ > hw/i386/pc.c | 3 +++ > hw/i386/pc_piix.c | 14 +++++++++++++- > hw/i386/pc_q35.c | 13 ++++++++++++- > hw/ppc/spapr.c | 15 +++++++++++++-- > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- > include/hw/boards.h | 3 +++ > include/hw/i386/pc.h | 3 +++ > 9 files changed, 71 insertions(+), 6 deletions(-) The for s390 change: Reviewed-by: Halil Pasic <pasic@linux.ibm.com>
On Wed, Jul 24, 2019 at 10:50:17AM -0300, Eduardo Habkost wrote: > On Wed, Jul 24, 2019 at 12:35:24PM +0200, Cornelia Huck wrote: > > Add 4.2 machine types for arm/i440fx/q35/s390x/spapr. > > > > For i440fx and q35, unversioned cpu models are still translated > > to -v1, as 0788a56bd1ae ("i386: Make unversioned CPU models be > > aliases") states this should only transition to the latest cpu > > model version in 4.3 (or later). > > > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > > Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> > > I plan to queue it for 4.2, but I think it's OK to queue this in > parallel through other trees if necessary (so patches that depend > on the new machine types can be queued too). Yeah, I've put it into my ppc-for-4.2 tree, expecting to resolve a minor conflict once the 4.2 tree opens. Oh, and, ppc parts Acked-by: David Gibson <david@gibson.dropbear.id.au>
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d9496c936342..64e3fc34401a 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2046,10 +2046,17 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); +static void virt_machine_4_2_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(4, 2) + static void virt_machine_4_1_options(MachineClass *mc) { + virt_machine_4_2_options(mc); + compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len); } -DEFINE_VIRT_MACHINE_AS_LATEST(4, 1) +DEFINE_VIRT_MACHINE(4, 1) static void virt_machine_4_0_options(MachineClass *mc) { diff --git a/hw/core/machine.c b/hw/core/machine.c index c58a8e594efc..a79d4ad740a0 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -27,6 +27,9 @@ #include "hw/pci/pci.h" #include "hw/mem/nvdimm.h" +GlobalProperty hw_compat_4_1[] = {}; +const size_t hw_compat_4_1_len = G_N_ELEMENTS(hw_compat_4_1); + GlobalProperty hw_compat_4_0[] = { { "VGA", "edid", "false" }, { "secondary-vga", "edid", "false" }, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 549c43705096..2aa1c49701dd 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -116,6 +116,9 @@ struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX}; /* Physical Address of PVH entry point read from kernel ELF NOTE */ static size_t pvh_start_addr; +GlobalProperty pc_compat_4_1[] = {}; +const size_t pc_compat_4_1_len = G_N_ELEMENTS(pc_compat_4_1); + GlobalProperty pc_compat_4_0[] = {}; const size_t pc_compat_4_0_len = G_N_ELEMENTS(pc_compat_4_0); diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index c2280c72effb..24e71be1d218 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -433,7 +433,7 @@ static void pc_i440fx_machine_options(MachineClass *m) machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); } -static void pc_i440fx_4_1_machine_options(MachineClass *m) +static void pc_i440fx_4_2_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_i440fx_machine_options(m); @@ -442,6 +442,18 @@ static void pc_i440fx_4_1_machine_options(MachineClass *m) pcmc->default_cpu_version = 1; } +DEFINE_I440FX_MACHINE(v4_2, "pc-i440fx-4.2", NULL, + pc_i440fx_4_2_machine_options); + +static void pc_i440fx_4_1_machine_options(MachineClass *m) +{ + pc_i440fx_4_2_machine_options(m); + m->alias = NULL; + m->is_default = 0; + compat_props_add(m->compat_props, hw_compat_4_1, hw_compat_4_1_len); + compat_props_add(m->compat_props, pc_compat_4_1, pc_compat_4_1_len); +} + DEFINE_I440FX_MACHINE(v4_1, "pc-i440fx-4.1", NULL, pc_i440fx_4_1_machine_options); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 397e1fdd2f37..e61260762cdc 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -365,7 +365,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus = 288; } -static void pc_q35_4_1_machine_options(MachineClass *m) +static void pc_q35_4_2_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_q35_machine_options(m); @@ -373,6 +373,17 @@ static void pc_q35_4_1_machine_options(MachineClass *m) pcmc->default_cpu_version = 1; } +DEFINE_Q35_MACHINE(v4_2, "pc-q35-4.2", NULL, + pc_q35_4_2_machine_options); + +static void pc_q35_4_1_machine_options(MachineClass *m) +{ + pc_q35_4_2_machine_options(m); + m->alias = NULL; + compat_props_add(m->compat_props, hw_compat_4_1, hw_compat_4_1_len); + compat_props_add(m->compat_props, pc_compat_4_1, pc_compat_4_1_len); +} + DEFINE_Q35_MACHINE(v4_1, "pc-q35-4.1", NULL, pc_q35_4_1_machine_options); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 821f0d4a49ff..6c8aa6054508 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4426,15 +4426,26 @@ static const TypeInfo spapr_machine_info = { } \ type_init(spapr_machine_register_##suffix) +/* + * pseries-4.2 + */ +static void spapr_machine_4_2_class_options(MachineClass *mc) +{ + /* Defaults for the latest behaviour inherited from the base class */ +} + +DEFINE_SPAPR_MACHINE(4_2, "4.2", true); + /* * pseries-4.1 */ static void spapr_machine_4_1_class_options(MachineClass *mc) { - /* Defaults for the latest behaviour inherited from the base class */ + spapr_machine_4_2_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len); } -DEFINE_SPAPR_MACHINE(4_1, "4.1", true); +DEFINE_SPAPR_MACHINE(4_1, "4.1", false); /* * pseries-4.0 diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 5b6a9a4e5574..593b34e0e201 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -660,14 +660,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_4_2_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_4_2_class_options(MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(4_2, "4.2", true); + static void ccw_machine_4_1_instance_options(MachineState *machine) { + ccw_machine_4_2_instance_options(machine); } static void ccw_machine_4_1_class_options(MachineClass *mc) { + ccw_machine_4_2_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len); } -DEFINE_CCW_MACHINE(4_1, "4.1", true); +DEFINE_CCW_MACHINE(4_1, "4.1", false); static void ccw_machine_4_0_instance_options(MachineState *machine) { diff --git a/include/hw/boards.h b/include/hw/boards.h index a71d1a53a5c0..d9ec37d80743 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -317,6 +317,9 @@ struct MachineState { } \ type_init(machine_initfn##_register_types) +extern GlobalProperty hw_compat_4_1[]; +extern const size_t hw_compat_4_1_len; + extern GlobalProperty hw_compat_4_0[]; extern const size_t hw_compat_4_0_len; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 859b64c51d45..c840e392515b 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -302,6 +302,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); int e820_get_num_entries(void); bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); +extern GlobalProperty pc_compat_4_1[]; +extern const size_t pc_compat_4_1_len; + extern GlobalProperty pc_compat_4_0[]; extern const size_t pc_compat_4_0_len;
Add 4.2 machine types for arm/i440fx/q35/s390x/spapr. For i440fx and q35, unversioned cpu models are still translated to -v1, as 0788a56bd1ae ("i386: Make unversioned CPU models be aliases") states this should only transition to the latest cpu model version in 4.3 (or later). Signed-off-by: Cornelia Huck <cohuck@redhat.com> --- hw/arm/virt.c | 9 ++++++++- hw/core/machine.c | 3 +++ hw/i386/pc.c | 3 +++ hw/i386/pc_piix.c | 14 +++++++++++++- hw/i386/pc_q35.c | 13 ++++++++++++- hw/ppc/spapr.c | 15 +++++++++++++-- hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- include/hw/boards.h | 3 +++ include/hw/i386/pc.h | 3 +++ 9 files changed, 71 insertions(+), 6 deletions(-)