Re: [Qemu-devel] [PATCH] pc: Add 2.7 machine

[Michael S. Tsirkin]

On Fri, May 27, 2016 at 03:55:35PM -0300, Eduardo Habkost wrote:
> From: Igor Mammedov <address@hidden>
> 
> Signed-off-by: Igor Mammedov <address@hidden>
> Reviewed-by: Eduardo Habkost <address@hidden>
> Signed-off-by: Eduardo Habkost <address@hidden>
> ---

Reviewed-by: Michael S. Tsirkin <address@hidden>

> This is blocking some patches from getting included (e.g.  the
> CPUID[0xB] patch from Radim), so I'm submitting Igor's RFC as
> [PATCH].
> 
> I will add it to my x86-next queue so I can queue x86 patches
> that depend on it. But I plan to wait until it gets merged
> through the PC tree and rebase before sending a x86 pull request.
> ---
>  hw/i386/pc_piix.c    | 16 +++++++++++++---
>  hw/i386/pc_q35.c     | 13 +++++++++++--
>  include/hw/i386/pc.h |  4 ++++
>  3 files changed, 28 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 24e7042..d3bbe8a 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -416,13 +416,25 @@ static void pc_i440fx_machine_options(MachineClass *m)
>      m->default_display = "std";
>  }
>  
> -static void pc_i440fx_2_6_machine_options(MachineClass *m)
> +static void pc_i440fx_2_7_machine_options(MachineClass *m)
>  {
>      pc_i440fx_machine_options(m);
>      m->alias = "pc";
>      m->is_default = 1;
>  }
>  
> +DEFINE_I440FX_MACHINE(v2_7, "pc-i440fx-2.7", NULL,
> +                      pc_i440fx_2_7_machine_options);
> +
> +
> +static void pc_i440fx_2_6_machine_options(MachineClass *m)
> +{
> +    pc_i440fx_2_7_machine_options(m);
> +    m->is_default = 0;
> +    m->alias = NULL;
> +    SET_MACHINE_COMPAT(m, PC_COMPAT_2_6);
> +}
> +
>  DEFINE_I440FX_MACHINE(v2_6, "pc-i440fx-2.6", NULL,
>                        pc_i440fx_2_6_machine_options);
>  
> @@ -431,8 +443,6 @@ static void pc_i440fx_2_5_machine_options(MachineClass *m)
>  {
>      PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
>      pc_i440fx_2_6_machine_options(m);
> -    m->alias = NULL;
> -    m->is_default = 0;
>      pcmc->save_tsc_khz = false;
>      m->legacy_fw_cfg_order = 1;
>      SET_MACHINE_COMPAT(m, PC_COMPAT_2_5);
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 04aae89..4787df1 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -283,12 +283,22 @@ static void pc_q35_machine_options(MachineClass *m)
>      m->no_floppy = 1;
>  }
>  
> -static void pc_q35_2_6_machine_options(MachineClass *m)
> +static void pc_q35_2_7_machine_options(MachineClass *m)
>  {
>      pc_q35_machine_options(m);
>      m->alias = "q35";
>  }
>  
> +DEFINE_Q35_MACHINE(v2_7, "pc-q35-2.7", NULL,
> +                   pc_q35_2_7_machine_options);
> +
> +static void pc_q35_2_6_machine_options(MachineClass *m)
> +{
> +    pc_q35_2_7_machine_options(m);
> +    m->alias = NULL;
> +    SET_MACHINE_COMPAT(m, PC_COMPAT_2_6);
> +}
> +
>  DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL,
>                     pc_q35_2_6_machine_options);
>  
> @@ -296,7 +306,6 @@ static void pc_q35_2_5_machine_options(MachineClass *m)
>  {
>      PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
>      pc_q35_2_6_machine_options(m);
> -    m->alias = NULL;
>      pcmc->save_tsc_khz = false;
>      m->legacy_fw_cfg_order = 1;
>      SET_MACHINE_COMPAT(m, PC_COMPAT_2_5);
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 9ca2309..ca23609 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -356,7 +356,11 @@ 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_6 \
> +    HW_COMPAT_2_6
> +
>  #define PC_COMPAT_2_5 \
> +    PC_COMPAT_2_6 \
>      HW_COMPAT_2_5
>  
>  /* Helper for setting model-id for CPU models that changed model-id
> -- 
> 2.5.5