Re: [Qemu-devel] [PATCH v2 09/10] hw/i386: add pc-i440fx-3.1 & pc-q35-3.1

[Marc-André Lureau]

On Thu, Nov 1, 2018 at 6:59 PM Igor Mammedov <address@hidden> wrote:
>
> On Tue, 30 Oct 2018 19:04:52 +0400
> Marc-André Lureau <address@hidden> wrote:
>
> > The following patch is going to add compatiblity parameters.
> >
> > Signed-off-by: Marc-André Lureau <address@hidden>
> > Reviewed-by: Michael S. Tsirkin <address@hidden>
> Reviewed-by: Igor Mammedov <address@hidden>

ping,
missing 3.1 pc machines is listed as not fixed yet:
https://wiki.qemu.org/Planning/3.1

we have 3 reviewed-by on this patch already.



>
> > ---
> >  include/hw/i386/pc.h |  2 +-
> >  hw/i386/pc_piix.c    | 15 ++++++++++++---
> >  hw/i386/pc_q35.c     | 13 +++++++++++--
> >  3 files changed, 24 insertions(+), 6 deletions(-)
> >
> > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> > index dfe6746692..67ff516d61 100644
> > --- a/include/hw/i386/pc.h
> > +++ b/include/hw/i386/pc.h
> > @@ -300,7 +300,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t 
> > *);
> >          .driver   = TYPE_X86_CPU,\
> >          .property = "x-hv-synic-kvm-only",\
> >          .value    = "on",\
> > -    }
> > +    },
> >
> >  #define PC_COMPAT_2_12 \
> >      HW_COMPAT_2_12 \
> > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> > index dc09466b3e..7092d6d13f 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_0_machine_options(MachineClass *m)
> > +static void pc_i440fx_3_1_machine_options(MachineClass *m)
> >  {
> >      pc_i440fx_machine_options(m);
> >      m->alias = "pc";
> >      m->is_default = 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);
> > +}
> > +
> >  DEFINE_I440FX_MACHINE(v3_0, "pc-i440fx-3.0", NULL,
> >                        pc_i440fx_3_0_machine_options);
> >
> >  static void pc_i440fx_2_12_machine_options(MachineClass *m)
> >  {
> >      pc_i440fx_3_0_machine_options(m);
> > -    m->is_default = 0;
> > -    m->alias = NULL;
> >      SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);
> >  }
> >
> > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> > index 532241e3f8..4702bb13c4 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_0_machine_options(MachineClass *m)
> > +static void pc_q35_3_1_machine_options(MachineClass *m)
> >  {
> >      pc_q35_machine_options(m);
> >      m->alias = "q35";
> >  }
> >
> > +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);
> > +}
> > +
> >  DEFINE_Q35_MACHINE(v3_0, "pc-q35-3.0", NULL,
> >                      pc_q35_3_0_machine_options);
> >
> >  static void pc_q35_2_12_machine_options(MachineClass *m)
> >  {
> >      pc_q35_3_0_machine_options(m);
> > -    m->alias = NULL;
> >      SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);
> >  }
> >
>