Hi On Tue, Dec 4, 2018 at 11:17 PM Christian Borntraeger <borntrae...@de.ibm.com> wrote: > > I think Conny has already added the s390/ccw part to her next tree. > From a quick glimpse both patches look identical. >
I also have them in my machine compatibilities series: https://patchew.org/QEMU/20181204142023.15982-1-marcandre.lur...@redhat.com/20181204142023.15982-18-marcandre.lur...@redhat.com/ https://patchew.org/QEMU/20181204142023.15982-1-marcandre.lur...@redhat.com/20181204142023.15982-19-marcandre.lur...@redhat.com/ Whoever goes first :) > On 04.12.2018 20:04, Alex Williamson wrote: > > For upcoming pcie-root-port compatibility, among possibly others. > > > > Cc: Peter Maydell <peter.mayd...@linaro.org> > > Cc: Michael S. Tsirkin <m...@redhat.com> > > Cc: Marcel Apfelbaum <marcel.apfelb...@gmail.com> > > Cc: Paolo Bonzini <pbonz...@redhat.com> > > Cc: Richard Henderson <r...@twiddle.net> > > Cc: Eduardo Habkost <ehabk...@redhat.com> > > Cc: David Hildenbrand <da...@redhat.com> > > Cc: Cornelia Huck <coh...@redhat.com> > > Cc: Christian Borntraeger <borntrae...@de.ibm.com> > > Acked-by: David Gibson <da...@gibson.dropbear.id.au> > > Signed-off-by: Alex Williamson <alex.william...@redhat.com> > > --- > > > > Re-spinning just this patch to include machine bump for ccw and > > Cc'ing s390/ccw maintainers. I think this rounds out all the > > versioned machines per Peter's request. I can respin a full series, > > but at the risk of confounding automated tools, I didn't want to > > further bombard inboxes with a high cadence. Thanks, > > > > Alex > > > > hw/arm/virt.c | 19 +++++++++++++++++-- > > hw/i386/pc_piix.c | 15 ++++++++++++--- > > hw/i386/pc_q35.c | 13 +++++++++++-- > > hw/ppc/spapr.c | 25 ++++++++++++++++++++++--- > > hw/s390x/s390-virtio-ccw.c | 17 ++++++++++++++++- > > include/hw/compat.h | 3 +++ > > include/hw/i386/pc.h | 3 +++ > > 7 files changed, 84 insertions(+), 11 deletions(-) > > > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > > index f69e7eb39977..beaf6bc43905 100644 > > --- a/hw/arm/virt.c > > +++ b/hw/arm/virt.c > > @@ -1797,7 +1797,7 @@ static void machvirt_machine_init(void) > > } > > type_init(machvirt_machine_init); > > > > -static void virt_3_1_instance_init(Object *obj) > > +static void virt_4_0_instance_init(Object *obj) > > { > > VirtMachineState *vms = VIRT_MACHINE(obj); > > VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); > > @@ -1867,10 +1867,25 @@ static void virt_3_1_instance_init(Object *obj) > > vms->irqmap = a15irqmap; > > } > > > > +static void virt_machine_4_0_options(MachineClass *mc) > > +{ > > +} > > +DEFINE_VIRT_MACHINE_AS_LATEST(4, 0) > > + > > +#define VIRT_COMPAT_3_1 \ > > + HW_COMPAT_3_1 > > + > > +static void virt_3_1_instance_init(Object *obj) > > +{ > > + virt_4_0_instance_init(obj); > > +} > > + > > static void virt_machine_3_1_options(MachineClass *mc) > > { > > + virt_machine_4_0_options(mc); > > + SET_MACHINE_COMPAT(mc, VIRT_COMPAT_3_1); > > } > > -DEFINE_VIRT_MACHINE_AS_LATEST(3, 1) > > +DEFINE_VIRT_MACHINE(3, 1) > > > > #define VIRT_COMPAT_3_0 \ > > HW_COMPAT_3_0 > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > > index 7092d6d13f66..cfaa83ee2fad 100644 > > --- a/hw/i386/pc_piix.c > > +++ b/hw/i386/pc_piix.c > > @@ -428,21 +428,30 @@ static void pc_i440fx_machine_options(MachineClass *m) > > machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); > > } > > > > -static void pc_i440fx_3_1_machine_options(MachineClass *m) > > +static void pc_i440fx_4_0_machine_options(MachineClass *m) > > { > > pc_i440fx_machine_options(m); > > m->alias = "pc"; > > m->is_default = 1; > > } > > > > +DEFINE_I440FX_MACHINE(v4_0, "pc-i440fx-4.0", NULL, > > + pc_i440fx_4_0_machine_options); > > + > > +static void pc_i440fx_3_1_machine_options(MachineClass *m) > > +{ > > + pc_i440fx_4_0_machine_options(m); > > + m->is_default = 0; > > + m->alias = NULL; > > + SET_MACHINE_COMPAT(m, PC_COMPAT_3_1); > > +} > > + > > DEFINE_I440FX_MACHINE(v3_1, "pc-i440fx-3.1", NULL, > > pc_i440fx_3_1_machine_options); > > > > static void pc_i440fx_3_0_machine_options(MachineClass *m) > > { > > pc_i440fx_3_1_machine_options(m); > > - m->is_default = 0; > > - m->alias = NULL; > > SET_MACHINE_COMPAT(m, PC_COMPAT_3_0); > > } > > > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > > index 4702bb13c472..e245db096dc1 100644 > > --- a/hw/i386/pc_q35.c > > +++ b/hw/i386/pc_q35.c > > @@ -311,19 +311,28 @@ static void pc_q35_machine_options(MachineClass *m) > > m->max_cpus = 288; > > } > > > > -static void pc_q35_3_1_machine_options(MachineClass *m) > > +static void pc_q35_4_0_machine_options(MachineClass *m) > > { > > pc_q35_machine_options(m); > > m->alias = "q35"; > > } > > > > +DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL, > > + pc_q35_4_0_machine_options); > > + > > +static void pc_q35_3_1_machine_options(MachineClass *m) > > +{ > > + pc_q35_4_0_machine_options(m); > > + m->alias = NULL; > > + SET_MACHINE_COMPAT(m, PC_COMPAT_3_1); > > +} > > + > > DEFINE_Q35_MACHINE(v3_1, "pc-q35-3.1", NULL, > > pc_q35_3_1_machine_options); > > > > static void pc_q35_3_0_machine_options(MachineClass *m) > > { > > pc_q35_3_1_machine_options(m); > > - m->alias = NULL; > > SET_MACHINE_COMPAT(m, PC_COMPAT_3_0); > > } > > > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > > index 7afd1a175bf2..80d8498867a6 100644 > > --- a/hw/ppc/spapr.c > > +++ b/hw/ppc/spapr.c > > @@ -3956,19 +3956,38 @@ static const TypeInfo spapr_machine_info = { > > } \ > > type_init(spapr_machine_register_##suffix) > > > > - /* > > +/* > > + * pseries-4.0 > > + */ > > +static void spapr_machine_4_0_instance_options(MachineState *machine) > > +{ > > +} > > + > > +static void spapr_machine_4_0_class_options(MachineClass *mc) > > +{ > > + /* Defaults for the latest behaviour inherited from the base class */ > > +} > > + > > +DEFINE_SPAPR_MACHINE(4_0, "4.0", true); > > + > > +/* > > * pseries-3.1 > > */ > > +#define SPAPR_COMPAT_3_1 \ > > + HW_COMPAT_3_1 > > + > > static void spapr_machine_3_1_instance_options(MachineState *machine) > > { > > + spapr_machine_4_0_instance_options(machine); > > } > > > > static void spapr_machine_3_1_class_options(MachineClass *mc) > > { > > - /* Defaults for the latest behaviour inherited from the base class */ > > + spapr_machine_3_1_class_options(mc); > > + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_3_1); > > } > > > > -DEFINE_SPAPR_MACHINE(3_1, "3.1", true); > > +DEFINE_SPAPR_MACHINE(3_1, "3.1", false); > > > > /* > > * pseries-3.0 > > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > > index a0615a8b35f5..fd9d0b0542bb 100644 > > --- a/hw/s390x/s390-virtio-ccw.c > > +++ b/hw/s390x/s390-virtio-ccw.c > > @@ -651,6 +651,9 @@ bool css_migration_enabled(void) > > } > > \ > > type_init(ccw_machine_register_##suffix) > > > > +#define CCW_COMPAT_3_1 \ > > + HW_COMPAT_3_1 > > + > > #define CCW_COMPAT_3_0 \ > > HW_COMPAT_3_0 > > > > @@ -742,14 +745,26 @@ bool css_migration_enabled(void) > > .value = "0",\ > > }, > > > > +static void ccw_machine_4_0_instance_options(MachineState *machine) > > +{ > > +} > > + > > +static void ccw_machine_4_0_class_options(MachineClass *mc) > > +{ > > +} > > +DEFINE_CCW_MACHINE(4_0, "4.0", true); > > + > > static void ccw_machine_3_1_instance_options(MachineState *machine) > > { > > + ccw_machine_4_0_instance_options(machine); > > } > > > > static void ccw_machine_3_1_class_options(MachineClass *mc) > > { > > + ccw_machine_4_0_class_options(mc); > > + SET_MACHINE_COMPAT(mc, CCW_COMPAT_3_1); > > } > > -DEFINE_CCW_MACHINE(3_1, "3.1", true); > > +DEFINE_CCW_MACHINE(3_1, "3.1", false); > > > > static void ccw_machine_3_0_instance_options(MachineState *machine) > > { > > diff --git a/include/hw/compat.h b/include/hw/compat.h > > index 6f4d5fc64704..70958328fe7a 100644 > > --- a/include/hw/compat.h > > +++ b/include/hw/compat.h > > @@ -1,6 +1,9 @@ > > #ifndef HW_COMPAT_H > > #define HW_COMPAT_H > > > > +#define HW_COMPAT_3_1 \ > > + /* empty */ > > + > > #define HW_COMPAT_3_0 \ > > /* empty */ > > > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > > index 136fe497b6b2..cb645bf368a3 100644 > > --- a/include/hw/i386/pc.h > > +++ b/include/hw/i386/pc.h > > @@ -294,6 +294,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 *); > > > > +#define PC_COMPAT_3_1 \ > > + HW_COMPAT_3_1 \ > > + > > #define PC_COMPAT_3_0 \ > > HW_COMPAT_3_0 \ > > {\ > > > > -- Marc-André Lureau
