[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 2/4] pc: Add pc-*-2.6 machine classes
From: |
Thomas Huth |
Subject: |
Re: [Qemu-devel] [PATCH v3 2/4] pc: Add pc-*-2.6 machine classes |
Date: |
Mon, 30 Nov 2015 17:31:08 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 |
On 30/11/15 15:56, Eduardo Habkost wrote:
> Add pc-i440fx-2.6 and pc-q35-2.6 machine classes.
>
> Signed-off-by: Eduardo Habkost <address@hidden>
> ---
> Changes v1 -> v2:
> * Add missing backslash to PC_COMPAT_2_4
>
> Changes v2 -> v3:
> * Add HW_COMPAT_2_5 to PC_COMPAT_2_5
> ---
> hw/i386/pc_piix.c | 16 +++++++++++++---
> hw/i386/pc_q35.c | 13 +++++++++++--
> include/hw/compat.h | 3 +++
> include/hw/i386/pc.h | 4 ++++
> 4 files changed, 31 insertions(+), 5 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 1a4ff01..299c07f 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -469,13 +469,25 @@ static void pc_i440fx_machine_options(MachineClass *m)
> m->default_display = "std";
> }
>
> -static void pc_i440fx_2_5_machine_options(MachineClass *m)
> +static void pc_i440fx_2_6_machine_options(MachineClass *m)
> {
> pc_i440fx_machine_options(m);
> m->alias = "pc";
> m->is_default = 1;
> }
>
> +DEFINE_I440FX_MACHINE(v2_6, "pc-i440fx-2.6", NULL,
> + pc_i440fx_2_6_machine_options);
> +
> +
> +static void pc_i440fx_2_5_machine_options(MachineClass *m)
> +{
> + pc_i440fx_2_6_machine_options(m);
> + m->alias = NULL;
> + m->is_default = 0;
> + SET_MACHINE_COMPAT(m, PC_COMPAT_2_5);
> +}
> +
> DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL,
> pc_i440fx_2_5_machine_options);
>
> @@ -485,8 +497,6 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m)
> PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> pc_i440fx_2_5_machine_options(m);
> m->hw_version = "2.4.0";
> - m->alias = NULL;
> - m->is_default = 0;
> pcmc->broken_reserved_end = true;
> SET_MACHINE_COMPAT(m, PC_COMPAT_2_4);
> }
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index f17acca..0086546 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -370,12 +370,22 @@ static void pc_q35_machine_options(MachineClass *m)
> m->no_tco = 0;
> }
>
> -static void pc_q35_2_5_machine_options(MachineClass *m)
> +static void pc_q35_2_6_machine_options(MachineClass *m)
> {
> pc_q35_machine_options(m);
> m->alias = "q35";
> }
>
> +DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL,
> + pc_q35_2_6_machine_options);
> +
> +static void pc_q35_2_5_machine_options(MachineClass *m)
> +{
> + pc_q35_2_6_machine_options(m);
> + m->alias = NULL;
> + SET_MACHINE_COMPAT(m, PC_COMPAT_2_5);
> +}
> +
> DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL,
> pc_q35_2_5_machine_options);
>
> @@ -384,7 +394,6 @@ static void pc_q35_2_4_machine_options(MachineClass *m)
> PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> pc_q35_2_5_machine_options(m);
> m->hw_version = "2.4.0";
> - m->alias = NULL;
> pcmc->broken_reserved_end = true;
> SET_MACHINE_COMPAT(m, PC_COMPAT_2_4);
> }
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index d0b1c4f..fae0d8e 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_5 \
> + /* empty */
> +
> #define HW_COMPAT_2_4 \
> {\
> .driver = "virtio-blk-device",\
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 854c330..3226291 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -296,7 +296,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_5 \
> + HW_COMPAT_2_5
> +
> #define PC_COMPAT_2_4 \
> + PC_COMPAT_2_5 \
> HW_COMPAT_2_4 \
> {\
> .driver = "Haswell-" TYPE_X86_CPU,\
Reviewed-by: Thomas Huth <address@hidden>