qemu-arm
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-arm] [Qemu-devel] [PATCH 1/3] hw/arm/virt: Add virt-2.12 machi


From: Andrew Jones
Subject: Re: [Qemu-arm] [Qemu-devel] [PATCH 1/3] hw/arm/virt: Add virt-2.12 machine type
Date: Tue, 12 Dec 2017 15:39:22 +0100
User-agent: Mutt/1.6.0.1 (2016-04-01)

On Fri, Dec 08, 2017 at 03:02:06PM +0000, Peter Maydell wrote:
> Add virt-2.12 machine type.
> 
> Signed-off-by: Peter Maydell <address@hidden>
> ---
>  include/hw/compat.h |  3 +++
>  hw/arm/virt.c       | 19 +++++++++++++++++--
>  2 files changed, 20 insertions(+), 2 deletions(-)


Reviewed-by: Andrew Jones <address@hidden>

> 
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index cf389b4..263de97 100644
> --- a/include/hw/compat.h
> +++ b/include/hw/compat.h
> @@ -1,6 +1,9 @@
>  #ifndef HW_COMPAT_H
>  #define HW_COMPAT_H
>  
> +#define HW_COMPAT_2_11 \
> +    /* empty */
> +
>  #define HW_COMPAT_2_10 \
>      {\
>          .driver   = "virtio-mouse-device",\
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 151592b..543f9bd 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -1618,7 +1618,7 @@ static void machvirt_machine_init(void)
>  }
>  type_init(machvirt_machine_init);
>  
> -static void virt_2_11_instance_init(Object *obj)
> +static void virt_2_12_instance_init(Object *obj)
>  {
>      VirtMachineState *vms = VIRT_MACHINE(obj);
>      VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
> @@ -1678,10 +1678,25 @@ static void virt_2_11_instance_init(Object *obj)
>      vms->irqmap = a15irqmap;
>  }
>  
> +static void virt_machine_2_12_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE_AS_LATEST(2, 12)
> +
> +#define VIRT_COMPAT_2_11 \
> +    HW_COMPAT_2_11
> +
> +static void virt_2_11_instance_init(Object *obj)
> +{
> +    virt_2_12_instance_init(obj);
> +}
> +
>  static void virt_machine_2_11_options(MachineClass *mc)
>  {
> +    virt_machine_2_12_options(mc);
> +    SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_11);
>  }
> -DEFINE_VIRT_MACHINE_AS_LATEST(2, 11)
> +DEFINE_VIRT_MACHINE(2, 11)
>  
>  #define VIRT_COMPAT_2_10 \
>      HW_COMPAT_2_10
> -- 
> 2.7.4
> 
> 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]