| Message ID | 154385451622.17724.12272989665681200621.stgit@gimli.home (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | pcie: Enhanced link speed and width support | expand |
On Mon, Dec 03, 2018 at 09:28:36AM -0700, Alex Williamson wrote: > Including all machine types that might have a pcie-root-port. > > Cc: Peter Maydell <peter.maydell@linaro.org> > Cc: Michael S. Tsirkin <mst@redhat.com> > Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: Richard Henderson <rth@twiddle.net> > Cc: Eduardo Habkost <ehabkost@redhat.com> > Cc: David Gibson <david@gibson.dropbear.id.au> > Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/arm/virt.c | 19 +++++++++++++++++-- > hw/i386/pc_piix.c | 15 ++++++++++++--- > hw/i386/pc_q35.c | 13 +++++++++++-- > hw/ppc/spapr.c | 25 ++++++++++++++++++++++--- > include/hw/compat.h | 3 +++ > include/hw/i386/pc.h | 3 +++ > 6 files changed, 68 insertions(+), 10 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/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 \ > {\ >
On Mon, Dec 03, 2018 at 09:28:36AM -0700, Alex Williamson wrote: > Including all machine types that might have a pcie-root-port. > > Cc: Peter Maydell <peter.maydell@linaro.org> > Cc: Michael S. Tsirkin <mst@redhat.com> > Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: Richard Henderson <rth@twiddle.net> > Cc: Eduardo Habkost <ehabkost@redhat.com> > Cc: David Gibson <david@gibson.dropbear.id.au> > Signed-off-by: Alex Williamson <alex.williamson@redhat.com> > --- [...] > +static void virt_3_1_instance_init(Object *obj) > +{ > + virt_4_0_instance_init(obj); > +} [...] > +/* > + * pseries-4.0 > + */ > +static void spapr_machine_4_0_instance_options(MachineState *machine) > +{ > +} Not something specific about patch, but: Why exactly virt and pseries machines need separate instance initialization functions? I'd like to eventually make all machine-type-version-specific behavior instrospectable, so it needs to be available at class_init time.
On Mon, 3 Dec 2018 at 16:28, Alex Williamson <alex.williamson@redhat.com> wrote: > > Including all machine types that might have a pcie-root-port. We should bump the version for every versioned machine we have, whether it has a pcie-root-port or not. Otherwise we'll forget at the end of the release cycle again... thanks -- PMM
On Tue, Dec 04, 2018 at 04:27:48PM -0200, Eduardo Habkost wrote: > On Mon, Dec 03, 2018 at 09:28:36AM -0700, Alex Williamson wrote: > > Including all machine types that might have a pcie-root-port. > > > > Cc: Peter Maydell <peter.maydell@linaro.org> > > Cc: Michael S. Tsirkin <mst@redhat.com> > > Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> > > Cc: Paolo Bonzini <pbonzini@redhat.com> > > Cc: Richard Henderson <rth@twiddle.net> > > Cc: Eduardo Habkost <ehabkost@redhat.com> > > Cc: David Gibson <david@gibson.dropbear.id.au> > > Signed-off-by: Alex Williamson <alex.williamson@redhat.com> > > --- > [...] > > +static void virt_3_1_instance_init(Object *obj) > > +{ > > + virt_4_0_instance_init(obj); > > +} > [...] > > +/* > > + * pseries-4.0 > > + */ > > +static void spapr_machine_4_0_instance_options(MachineState *machine) > > +{ > > +} > > Not something specific about patch, but: > > Why exactly virt and pseries machines need separate instance > initialization functions? So looking through, it appears to have been used exactly twice. 1) For pseries-2.7 and earlier we turn off spapr->use_hotplug_event_source That's setting the initial value of a feature flag that can later be overridden by a property. I can't actually see any good reason we want the property, but I guess it's there now. Regardless it should be pretty easy to fix - just initialize the state value from one in the class. 2) For pseries-2.2 and earlier we turn on machine->suppress_vmdesc. I don't really know what suppress_vmdesc is about. Again it appears to be adjustable with a property, which is why it's in MachineState rather than MachineClass. It could be fixed as (1), but that's generic code rather than in my bailiwick. Note that x86 also appears to set this on the instance for pc-2.2 and earlier. > I'd like to eventually make all machine-type-version-specific > behavior instrospectable, so it needs to be available at > class_init time.
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/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 \ {\
Including all machine types that might have a pcie-root-port. Cc: Peter Maydell <peter.maydell@linaro.org> Cc: Michael S. Tsirkin <mst@redhat.com> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Richard Henderson <rth@twiddle.net> Cc: Eduardo Habkost <ehabkost@redhat.com> Cc: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Alex Williamson <alex.williamson@redhat.com> --- hw/arm/virt.c | 19 +++++++++++++++++-- hw/i386/pc_piix.c | 15 ++++++++++++--- hw/i386/pc_q35.c | 13 +++++++++++-- hw/ppc/spapr.c | 25 ++++++++++++++++++++++--- include/hw/compat.h | 3 +++ include/hw/i386/pc.h | 3 +++ 6 files changed, 68 insertions(+), 10 deletions(-)