Re: [Qemu-devel] [PATCH 1/2] pc: add 2.11 machine type

[Eduardo Habkost <ehabkost@redhat.com>]

On Tue, Sep 05, 2017 at 05:30:04PM +0800, Gonglei wrote:
> CC: "Michael S. Tsirkin" <mst@redhat.com>
> CC: Paolo Bonzini <pbonzini@redhat.com>
> CC: Richard Henderson <rth@twiddle.net>
> CC: Eduardo Habkost <ehabkost@redhat.com>
> Signed-off-by: Gonglei <arei.gonglei@huawei.com>
> ---
>  hw/i386/pc_piix.c    | 15 ++++++++++++---
>  hw/i386/pc_q35.c     | 13 +++++++++++--
>  include/hw/i386/pc.h |  3 +++
>  3 files changed, 26 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 46dfd2c..b03cc04 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -436,21 +436,30 @@ static void pc_i440fx_machine_options(MachineClass *m)
>      m->default_display = "std";
>  }
>  
> -static void pc_i440fx_2_10_machine_options(MachineClass *m)
> +static void pc_i440fx_2_11_machine_options(MachineClass *m)
>  {
>      pc_i440fx_machine_options(m);
>      m->alias = "pc";
>      m->is_default = 1;
>  }
>  
> +DEFINE_I440FX_MACHINE(v2_11, "pc-i440fx-2.11", NULL,
> +                      pc_i440fx_2_11_machine_options);
> +
> +static void pc_i440fx_2_10_machine_options(MachineClass *m)
> +{
> +    pc_i440fx_2_11_machine_options(m);
> +    m->is_default = 0;
> +    m->alias = NULL;
> +    SET_MACHINE_COMPAT(m, PC_COMPAT_2_10);
> +}
> +
>  DEFINE_I440FX_MACHINE(v2_10, "pc-i440fx-2.10", NULL,
>                        pc_i440fx_2_10_machine_options);
>  
>  static void pc_i440fx_2_9_machine_options(MachineClass *m)
>  {
>      pc_i440fx_2_10_machine_options(m);
> -    m->is_default = 0;
> -    m->alias = NULL;
>      SET_MACHINE_COMPAT(m, PC_COMPAT_2_9);
>      m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
>  }
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 169a214..d6fef8d 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -302,20 +302,29 @@ static void pc_q35_machine_options(MachineClass *m)
>      m->max_cpus = 288;
>  }
>  
> -static void pc_q35_2_10_machine_options(MachineClass *m)
> +static void pc_q35_2_11_machine_options(MachineClass *m)
>  {
>      pc_q35_machine_options(m);
>      m->alias = "q35";
>      m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
>  }
>  
> +DEFINE_Q35_MACHINE(v2_11, "pc-q35-2.11", NULL,
> +                   pc_q35_2_11_machine_options);
> +
> +static void pc_q35_2_10_machine_options(MachineClass *m)
> +{
> +    pc_q35_2_11_machine_options(m);
> +    m->alias = NULL;
> +    SET_MACHINE_COMPAT(m, PC_COMPAT_2_10);
> +}
> +
>  DEFINE_Q35_MACHINE(v2_10, "pc-q35-2.10", NULL,
>                     pc_q35_2_10_machine_options);
>  
>  static void pc_q35_2_9_machine_options(MachineClass *m)
>  {
>      pc_q35_2_10_machine_options(m);
> -    m->alias = NULL;
>      SET_MACHINE_COMPAT(m, PC_COMPAT_2_9);
>  }
>  
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index d80859b..8226904 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -369,6 +369,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
>  int e820_get_num_entries(void);
>  bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
>  
> +#define PC_COMPAT_2_10 \
> +    HW_COMPAT_2_10 \
> +

Patch looks good, but I would remove the trailing backslash here.

With that changed:

Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>


>  #define PC_COMPAT_2_9 \
>      HW_COMPAT_2_9 \
>      {\
> -- 
> 1.8.3.1
> 
> 

-- 
Eduardo