[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] hw: add compat machines for 5.0
|
From: |
David Gibson |
|
Subject: |
Re: [PATCH] hw: add compat machines for 5.0 |
|
Date: |
Fri, 15 Nov 2019 20:32:40 +1100 |
|
User-agent: |
Mutt/1.12.1 (2019-06-15) |
On Tue, Nov 12, 2019 at 11:48:11AM +0100, Cornelia Huck wrote:
> Add 5.0 machine types for arm/i440fx/q35/s390x/spapr.
>
> For i440fx and q35, unversioned cpu models are still translated
> to -v1; I'll leave changing this (if desired) to the respective
> maintainers.
>
> Signed-off-by: Cornelia Huck <address@hidden>
Acked-by: David Gibson <address@hidden>
> ---
>
> also pushed out to https://github.com/cohuck/qemu machine-5.0
>
> x86 folks: if you want to change the cpu model versioning, I
> can do it in this patch, or just do it on top yourselves
>
> ---
> hw/arm/virt.c | 7 ++++++-
> hw/core/machine.c | 3 +++
> hw/i386/pc.c | 3 +++
> hw/i386/pc_piix.c | 14 +++++++++++++-
> hw/i386/pc_q35.c | 13 ++++++++++++-
> hw/ppc/spapr.c | 15 +++++++++++++--
> hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
> include/hw/boards.h | 3 +++
> include/hw/i386/pc.h | 3 +++
> 9 files changed, 69 insertions(+), 6 deletions(-)
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index d4bedc260712..02f654b63278 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -2147,10 +2147,15 @@ static void machvirt_machine_init(void)
> }
> type_init(machvirt_machine_init);
>
> +static void virt_machine_5_0_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE_AS_LATEST(5, 0)
> +
> static void virt_machine_4_2_options(MachineClass *mc)
> {
> }
> -DEFINE_VIRT_MACHINE_AS_LATEST(4, 2)
> +DEFINE_VIRT_MACHINE(4, 2)
>
> static void virt_machine_4_1_options(MachineClass *mc)
> {
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 1689ad3bf8af..21fe2d974817 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -27,6 +27,9 @@
> #include "hw/pci/pci.h"
> #include "hw/mem/nvdimm.h"
>
> +GlobalProperty hw_compat_4_2[] = {};
> +const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2);
> +
> GlobalProperty hw_compat_4_1[] = {
> { "virtio-pci", "x-pcie-flr-init", "off" },
> };
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 96715f8a3f99..2126c49ee7c5 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -103,6 +103,9 @@
>
> struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX};
>
> +GlobalProperty pc_compat_4_2[] = {};
> +const size_t pc_compat_4_2_len = G_N_ELEMENTS(pc_compat_4_2);
> +
> GlobalProperty pc_compat_4_1[] = {};
> const size_t pc_compat_4_1_len = G_N_ELEMENTS(pc_compat_4_1);
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 2aefa3b8dfe3..65915ea23c4a 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -424,7 +424,7 @@ static void pc_i440fx_machine_options(MachineClass *m)
> machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
> }
>
> -static void pc_i440fx_4_2_machine_options(MachineClass *m)
> +static void pc_i440fx_5_0_machine_options(MachineClass *m)
> {
> PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> pc_i440fx_machine_options(m);
> @@ -433,6 +433,18 @@ static void pc_i440fx_4_2_machine_options(MachineClass
> *m)
> pcmc->default_cpu_version = 1;
> }
>
> +DEFINE_I440FX_MACHINE(v5_0, "pc-i440fx-5.0", NULL,
> + pc_i440fx_5_0_machine_options);
> +
> +static void pc_i440fx_4_2_machine_options(MachineClass *m)
> +{
> + pc_i440fx_5_0_machine_options(m);
> + m->alias = NULL;
> + m->is_default = 0;
> + compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len);
> + compat_props_add(m->compat_props, pc_compat_4_2, pc_compat_4_2_len);
> +}
> +
> DEFINE_I440FX_MACHINE(v4_2, "pc-i440fx-4.2", NULL,
> pc_i440fx_4_2_machine_options);
>
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index d51f5247276d..c582a6f6a363 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -348,7 +348,7 @@ static void pc_q35_machine_options(MachineClass *m)
> m->max_cpus = 288;
> }
>
> -static void pc_q35_4_2_machine_options(MachineClass *m)
> +static void pc_q35_5_0_machine_options(MachineClass *m)
> {
> PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> pc_q35_machine_options(m);
> @@ -356,6 +356,17 @@ static void pc_q35_4_2_machine_options(MachineClass *m)
> pcmc->default_cpu_version = 1;
> }
>
> +DEFINE_Q35_MACHINE(v5_0, "pc-q35-5.0", NULL,
> + pc_q35_5_0_machine_options);
> +
> +static void pc_q35_4_2_machine_options(MachineClass *m)
> +{
> + pc_q35_5_0_machine_options(m);
> + m->alias = NULL;
> + compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len);
> + compat_props_add(m->compat_props, pc_compat_4_2, pc_compat_4_2_len);
> +}
> +
> DEFINE_Q35_MACHINE(v4_2, "pc-q35-4.2", NULL,
> pc_q35_4_2_machine_options);
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 94f9d27096af..d5c33f2c19d3 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4486,15 +4486,26 @@ static const TypeInfo spapr_machine_info = {
> } \
> type_init(spapr_machine_register_##suffix)
>
> +/*
> + * pseries-5.0
> + */
> +static void spapr_machine_5_0_class_options(MachineClass *mc)
> +{
> + /* Defaults for the latest behaviour inherited from the base class */
> +}
> +
> +DEFINE_SPAPR_MACHINE(5_0, "5.0", true);
> +
> /*
> * pseries-4.2
> */
> static void spapr_machine_4_2_class_options(MachineClass *mc)
> {
> - /* Defaults for the latest behaviour inherited from the base class */
> + spapr_machine_5_0_class_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len);
> }
>
> -DEFINE_SPAPR_MACHINE(4_2, "4.2", true);
> +DEFINE_SPAPR_MACHINE(4_2, "4.2", false);
>
> /*
> * pseries-4.1
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index d3edeef0ad92..01e7e209a5da 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -639,14 +639,26 @@ bool css_migration_enabled(void)
> }
> \
> type_init(ccw_machine_register_##suffix)
>
> +static void ccw_machine_5_0_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_5_0_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(5_0, "5.0", true);
> +
> static void ccw_machine_4_2_instance_options(MachineState *machine)
> {
> + ccw_machine_5_0_instance_options(machine);
> }
>
> static void ccw_machine_4_2_class_options(MachineClass *mc)
> {
> + ccw_machine_5_0_class_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len);
> }
> -DEFINE_CCW_MACHINE(4_2, "4.2", true);
> +DEFINE_CCW_MACHINE(4_2, "4.2", false);
>
> static void ccw_machine_4_1_instance_options(MachineState *machine)
> {
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index de45087f34cb..24cbeecbaecc 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -329,6 +329,9 @@ struct MachineState {
> } \
> type_init(machine_initfn##_register_types)
>
> +extern GlobalProperty hw_compat_4_2[];
> +extern const size_t hw_compat_4_2_len;
> +
> extern GlobalProperty hw_compat_4_1[];
> extern const size_t hw_compat_4_1_len;
>
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index e6fa8418ca61..0b23fc73c99b 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -239,6 +239,9 @@ void pc_system_firmware_init(PCMachineState *pcms,
> MemoryRegion *rom_memory);
> void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
> const CPUArchIdList *apic_ids, GArray *entry);
>
> +extern GlobalProperty pc_compat_4_2[];
> +extern const size_t pc_compat_4_2_len;
> +
> extern GlobalProperty pc_compat_4_1[];
> extern const size_t pc_compat_4_1_len;
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature