On Fri, Feb 07, 2020 at 01:46:37AM -0500, Michael S. Tsirkin wrote: > We are going to add more init for the latest machine, so move the setup > to a function so we don't have to change the DEFINE_SPAPR_MACHINE macro > each time. > > Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
Applied to ppc-for-5.0. > --- > hw/ppc/spapr.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 02cf53fc5b..4cf2a992a5 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4428,6 +4428,12 @@ static const TypeInfo spapr_machine_info = { > }, > }; > > +static void spapr_machine_latest_class_options(MachineClass *mc) > +{ > + mc->alias = "pseries"; > + mc->is_default = 1; > +} > + > #define DEFINE_SPAPR_MACHINE(suffix, verstr, latest) \ > static void spapr_machine_##suffix##_class_init(ObjectClass *oc, \ > void *data) \ > @@ -4435,8 +4441,7 @@ static const TypeInfo spapr_machine_info = { > MachineClass *mc = MACHINE_CLASS(oc); \ > spapr_machine_##suffix##_class_options(mc); \ > if (latest) { \ > - mc->alias = "pseries"; \ > - mc->is_default = 1; \ > + spapr_machine_latest_class_options(mc); \ > } \ > } \ > static const TypeInfo spapr_machine_##suffix##_info = { \ -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature