[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 8/9] hw/i386: add pc-i440fx-3.1 & pc-q35-3.1
From: |
Michael S. Tsirkin |
Subject: |
Re: [Qemu-devel] [PATCH 8/9] hw/i386: add pc-i440fx-3.1 & pc-q35-3.1 |
Date: |
Fri, 21 Sep 2018 13:21:53 -0400 |
On Wed, Sep 12, 2018 at 04:55:30PM +0400, Marc-André Lureau wrote:
> The following patch is going to add compatiblity parameters.
>
> Signed-off-by: Marc-André Lureau <address@hidden>
For pc bits:
Reviewed-by: Michael S. Tsirkin <address@hidden>
> ---
> include/hw/i386/pc.h | 5 ++++-
> hw/i386/pc_piix.c | 15 ++++++++++++---
> hw/i386/pc_q35.c | 13 +++++++++++--
> 3 files changed, 27 insertions(+), 6 deletions(-)
>
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 6894f37df1..09b0365a8e 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -294,7 +294,10 @@ 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_12 \
> +#define PC_COMPAT_3_0 \
> + HW_COMPAT_3_0
> +
> +#define PC_COMPAT_2_12 \
> HW_COMPAT_2_12 \
> {\
> .driver = TYPE_X86_CPU,\
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index dc09466b3e..7092d6d13f 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -428,21 +428,30 @@ static void pc_i440fx_machine_options(MachineClass *m)
> machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
> }
>
> -static void pc_i440fx_3_0_machine_options(MachineClass *m)
> +static void pc_i440fx_3_1_machine_options(MachineClass *m)
> {
> pc_i440fx_machine_options(m);
> m->alias = "pc";
> m->is_default = 1;
> }
>
> +DEFINE_I440FX_MACHINE(v3_1, "pc-i440fx-3.1", NULL,
> + pc_i440fx_3_1_machine_options);
> +
> +static void pc_i440fx_3_0_machine_options(MachineClass *m)
> +{
> + pc_i440fx_3_1_machine_options(m);
> + m->is_default = 0;
> + m->alias = NULL;
> + SET_MACHINE_COMPAT(m, PC_COMPAT_3_0);
> +}
> +
> DEFINE_I440FX_MACHINE(v3_0, "pc-i440fx-3.0", NULL,
> pc_i440fx_3_0_machine_options);
>
> static void pc_i440fx_2_12_machine_options(MachineClass *m)
> {
> pc_i440fx_3_0_machine_options(m);
> - m->is_default = 0;
> - m->alias = NULL;
> SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);
> }
>
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 532241e3f8..4702bb13c4 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -311,19 +311,28 @@ static void pc_q35_machine_options(MachineClass *m)
> m->max_cpus = 288;
> }
>
> -static void pc_q35_3_0_machine_options(MachineClass *m)
> +static void pc_q35_3_1_machine_options(MachineClass *m)
> {
> pc_q35_machine_options(m);
> m->alias = "q35";
> }
>
> +DEFINE_Q35_MACHINE(v3_1, "pc-q35-3.1", NULL,
> + pc_q35_3_1_machine_options);
> +
> +static void pc_q35_3_0_machine_options(MachineClass *m)
> +{
> + pc_q35_3_1_machine_options(m);
> + m->alias = NULL;
> + SET_MACHINE_COMPAT(m, PC_COMPAT_3_0);
> +}
> +
> DEFINE_Q35_MACHINE(v3_0, "pc-q35-3.0", NULL,
> pc_q35_3_0_machine_options);
>
> static void pc_q35_2_12_machine_options(MachineClass *m)
> {
> pc_q35_3_0_machine_options(m);
> - m->alias = NULL;
> SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);
> }
>
> --
> 2.19.0.rc1
- [Qemu-devel] [PATCH 0/9] hostmem-ram: use whole path for region name with >= 3.1, Marc-André Lureau, 2018/09/12
- [Qemu-devel] [PATCH 1/9] qom/user-creatable: add a few helper macros, Marc-André Lureau, 2018/09/12
- [Qemu-devel] [PATCH 2/9] accel: register global_props like machine globals, Marc-André Lureau, 2018/09/12
- [Qemu-devel] [PATCH 3/9] qdev: move qdev_prop_register_global_list() to tests, Marc-André Lureau, 2018/09/12
- [Qemu-devel] [PATCH 4/9] qom/globals: move qdev globals to qom, Marc-André Lureau, 2018/09/12
- [Qemu-devel] [PATCH 5/9] qom/globals: generalize object_property_set_globals(), Marc-André Lureau, 2018/09/12
- [Qemu-devel] [PATCH 6/9] qom/object: set globals when initializing object, Marc-André Lureau, 2018/09/12
- [Qemu-devel] [PATCH 7/9] tests: add user-creatable test to test-qdev-global-props, Marc-André Lureau, 2018/09/12
- [Qemu-devel] [PATCH 8/9] hw/i386: add pc-i440fx-3.1 & pc-q35-3.1, Marc-André Lureau, 2018/09/12
- Re: [Qemu-devel] [PATCH 8/9] hw/i386: add pc-i440fx-3.1 & pc-q35-3.1,
Michael S. Tsirkin <=
- [Qemu-devel] [PATCH 9/9] hostmem-ram: use whole path for memory region name with >= 3.1, Marc-André Lureau, 2018/09/12