Re: [PATCH v6 2/7] hw: add 5.2 machine types and 5.1 compat options

[Cornelia Huck]

On Wed, 19 Aug 2020 14:54:25 +0200
Igor Mammedov <imammedo@redhat.com> wrote:

> On Tue, 18 Aug 2020 17:11:32 +0200
> Cornelia Huck <cohuck@redhat.com> wrote:
> 
> > On Tue, 18 Aug 2020 15:33:43 +0100
> > Stefan Hajnoczi <stefanha@redhat.com> wrote:
> >   
> > > arm, i386, ppc, and s390x have versioned machine types and associated
> > > compatibility options. Introduce new ones now that QEMU 5.1 has been
> > > released.
> > > 
> > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> > > ---
> > >  include/hw/boards.h        |  3 +++
> > >  include/hw/i386/pc.h       |  3 +++
> > >  hw/arm/virt.c              |  9 ++++++++-
> > >  hw/core/machine.c          |  4 ++++
> > >  hw/i386/pc.c               |  4 ++++
> > >  hw/i386/pc_piix.c          | 14 +++++++++++++-
> > >  hw/i386/pc_q35.c           | 13 ++++++++++++-
> > >  hw/ppc/spapr.c             | 15 +++++++++++++--
> > >  hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
> > >  9 files changed, 73 insertions(+), 6 deletions(-)    
> > 
> > https://lore.kernel.org/qemu-devel/20200728094645.272149-1-cohuck@redhat.com/
> > is already out there :)  
> 
> That one doesn't apply anymore (or I did something wrong when applying it),
> 
> but Stefan's version applies cleanly

Seems that there were some changes afterwards. I'd prefer to just
respin mine, though.