On Fri, Dec 17, 2021 at 03:39:48PM +0100, Cornelia Huck wrote:
> Add 7.0 machine types for arm/i440fx/q35/s390x/spapr.
>
> Acked-by: Cédric Le Goater <c...@kaod.org>
> Reviewed-by: Juan Quintela <quint...@redhat.com>
> Signed-off-by: Cornelia Huck <coh...@redhat.com>
> ---
>
> v1->v2: fix typo in i386 function chaining (thanks danpb!)
>
> ---
> 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/arm/virt.c b/hw/arm/virt.c
> index 6bce595aba20..4593fea1ce8a 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -2856,10 +2856,17 @@ static void machvirt_machine_init(void)
> }
> type_init(machvirt_machine_init);
>
> +static void virt_machine_7_0_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE_AS_LATEST(7, 0)
> +
> static void virt_machine_6_2_options(MachineClass *mc)
> {
> + virt_machine_7_0_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_6_2, hw_compat_6_2_len);
> }
> -DEFINE_VIRT_MACHINE_AS_LATEST(6, 2)
> +DEFINE_VIRT_MACHINE(6, 2)
>
> static void virt_machine_6_1_options(MachineClass *mc)
> {
For the arm parts
Reviewed-by: Andrew Jones <drjo...@redhat.com>
