Re: [PATCH for-8.0] hw: Add compat machines for 8.0

[Cornelia Huck <cohuck@redhat.com>]

On Tue, Nov 15 2022, Greg Kurz <groug@kaod.org> wrote:

> On Fri, 11 Nov 2022 13:45:34 +0100
> Cornelia Huck <cohuck@redhat.com> wrote:
>
>> Add 8.0 machine types for arm/i440fx/m68k/q35/s390x/spapr.
>> 
>> Signed-off-by: Cornelia Huck <cohuck@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/m68k/virt.c             |  9 ++++++++-
>>  hw/ppc/spapr.c             | 15 +++++++++++++--
>>  hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
>>  include/hw/boards.h        |  3 +++
>>  include/hw/i386/pc.h       |  3 +++
>>  10 files changed, 79 insertions(+), 7 deletions(-)
>> 
>> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
>> index b87135085610..2a46660980e7 100644
>> --- a/hw/arm/virt.c
>> +++ b/hw/arm/virt.c
>> @@ -3096,10 +3096,17 @@ static void machvirt_machine_init(void)
>>  }
>>  type_init(machvirt_machine_init);
>>  
>> +static void virt_machine_8_0_options(MachineClass *mc)
>> +{
>> +}
>> +DEFINE_VIRT_MACHINE_AS_LATEST(8, 0)
>> +
>>  static void virt_machine_7_2_options(MachineClass *mc)
>>  {
>> +    virt_machine_8_0_options(mc);
>> +    compat_props_add(mc->compat_props, hw_compat_7_2, hw_compat_7_2_len);
>>  }
>> -DEFINE_VIRT_MACHINE_AS_LATEST(7, 2)
>> +DEFINE_VIRT_MACHINE(7, 2)
>>  
>>  static void virt_machine_7_1_options(MachineClass *mc)
>>  {
>> diff --git a/hw/core/machine.c b/hw/core/machine.c
>> index 8d34caa31dc8..f264fb53b46c 100644
>> --- a/hw/core/machine.c
>> +++ b/hw/core/machine.c
>> @@ -40,6 +40,9 @@
>>  #include "hw/virtio/virtio-pci.h"
>>  #include "qom/object_interfaces.h"
>>  
>> +GlobalProperty hw_compat_7_2[] ={};
>
> Missing space between '=' and '{}'.

Oops. Maybe this can be fixed up by whoever ends up applying this, or
maybe this will be changed by another patch immediately anyway.

>
> Anyway, for ppc parts:
>
> Reviewed-by: Greg Kurz <groug@kaod.org>

Thanks :)