On Mon, 16 Nov 2020 11:23:14 +0100 Greg Kurz <gr...@kaod.org> wrote: > On Mon, 9 Nov 2020 18:39:28 +0100 > Cornelia Huck <coh...@redhat.com> wrote: > > > Add 6.0 machine types for arm/i440fx/q35/s390x/spapr. > > > > Signed-off-by: Cornelia Huck <coh...@redhat.com> > > --- > > hw/arm/virt.c | 9 ++++++++- > > hw/core/machine.c | 3 +++ > > hw/i386/pc.c | 3 +++ > > hw/i386/pc_piix.c | 14 +++++++++++++- > > hw/i386/pc_q35.c | 13 ++++++++++++- > > hw/ppc/spapr.c | 15 +++++++++++++-- > > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- > > include/hw/boards.h | 3 +++ > > include/hw/i386/pc.h | 3 +++ > > 9 files changed, 71 insertions(+), 6 deletions(-) > >
(...) > > diff --git a/hw/core/machine.c b/hw/core/machine.c > > index 98b87f76cbbe..c5a6c517bb9d 100644 > > --- a/hw/core/machine.c > > +++ b/hw/core/machine.c > > @@ -28,6 +28,9 @@ > > #include "hw/mem/nvdimm.h" > > #include "migration/vmstate.h" > > > > +GlobalProperty hw_compat_5_2[] = {}; > > Maybe worth putting the }; on the next line so that the next > change has a prettier diff ? That's mostly because I always copy from the last incarnation of that patch; but can try to remember to change next time. > > Apart from that, > > Reviewed-by: Greg Kurz <gr...@kaod.org> Thanks!