On Thu, 6 Dec 2018 17:12:40 -0200
Eduardo Habkost <ehabk...@redhat.com> wrote:
> On Tue, Dec 04, 2018 at 09:27:16AM -0700, Alex Williamson wrote:
> > Including all machine types that might have a pcie-root-port.
> >
> > 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>
> > Acked-by: David Gibson <da...@gibson.dropbear.id.au>
> > Signed-off-by: Alex Williamson <alex.william...@redhat.com>
> > ---
> [...]
> > 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);
>
> Infinite recursion. This is supposed to be calling
> spapr_machine_4_0_class_options(). I will fix manually on
> machine-next.
Gack! Thanks!
Alex
