* [PATCH for-7.2] hw: Add compat machines for 7.2
@ 2022-07-27 12:17 Cornelia Huck
2022-07-28 13:21 ` Daniel Henrique Barboza
2022-07-28 13:40 ` Michael S. Tsirkin
0 siblings, 2 replies; 3+ messages in thread
From: Cornelia Huck @ 2022-07-27 12:17 UTC (permalink / raw)
To: Peter Maydell, Eduardo Habkost, Marcel Apfelbaum,
Philippe Mathieu-Daudé,
Yanan Wang, Paolo Bonzini, Richard Henderson, Michael S. Tsirkin,
Laurent Vivier, Cédric Le Goater, Daniel Henrique Barboza,
David Gibson, Greg Kurz, Thomas Huth, David Hildenbrand,
Halil Pasic, Christian Borntraeger, Eric Farman
Cc: qemu-arm, qemu-devel, qemu-ppc, qemu-s390x, Cornelia Huck
Add 7.2 machine types for arm/i440fx/m68k/q35/s390x/spapr.
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
hw/arm/virt.c | 9 ++++++++-
hw/core/machine.c | 3 +++
hw/i386/pc.c | 3 +++
hw/i386/pc_piix.c | 14 +++++++++++++-
hw/i386/pc_q35.c | 13 ++++++++++++-
hw/m68k/virt.c | 9 ++++++++-
hw/ppc/spapr.c | 15 +++++++++++++--
hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
include/hw/boards.h | 3 +++
include/hw/i386/pc.h | 3 +++
10 files changed, 79 insertions(+), 7 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 9633f822f361..1a6480fd2a76 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3094,10 +3094,17 @@ static void machvirt_machine_init(void)
}
type_init(machvirt_machine_init);
+static void virt_machine_7_2_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE_AS_LATEST(7, 2)
+
static void virt_machine_7_1_options(MachineClass *mc)
{
+ virt_machine_7_2_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len);
}
-DEFINE_VIRT_MACHINE_AS_LATEST(7, 1)
+DEFINE_VIRT_MACHINE(7, 1)
static void virt_machine_7_0_options(MachineClass *mc)
{
diff --git a/hw/core/machine.c b/hw/core/machine.c
index a673302ccec5..aa520e74a8c8 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -40,6 +40,9 @@
#include "hw/virtio/virtio-pci.h"
#include "qom/object_interfaces.h"
+GlobalProperty hw_compat_7_1[] = {};
+const size_t hw_compat_7_1_len = G_N_ELEMENTS(hw_compat_7_1);
+
GlobalProperty hw_compat_7_0[] = {
{ "arm-gicv3-common", "force-8-bit-prio", "on" },
{ "nvme-ns", "eui64-default", "on"},
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 774cb2bf0748..31724c42ac90 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -107,6 +107,9 @@
{ "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\
{ "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },
+GlobalProperty pc_compat_7_1[] = {};
+const size_t pc_compat_7_1_len = G_N_ELEMENTS(pc_compat_7_1);
+
GlobalProperty pc_compat_7_0[] = {};
const size_t pc_compat_7_0_len = G_N_ELEMENTS(pc_compat_7_0);
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index a234989ac363..34fa0021c7be 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_VMBUS_BRIDGE);
}
-static void pc_i440fx_7_1_machine_options(MachineClass *m)
+static void pc_i440fx_7_2_machine_options(MachineClass *m)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_i440fx_machine_options(m);
@@ -433,6 +433,18 @@ static void pc_i440fx_7_1_machine_options(MachineClass *m)
pcmc->default_cpu_version = 1;
}
+DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL,
+ pc_i440fx_7_2_machine_options);
+
+static void pc_i440fx_7_1_machine_options(MachineClass *m)
+{
+ pc_i440fx_7_2_machine_options(m);
+ m->alias = NULL;
+ m->is_default = false;
+ compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len);
+ compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len);
+}
+
DEFINE_I440FX_MACHINE(v7_1, "pc-i440fx-7.1", NULL,
pc_i440fx_7_1_machine_options);
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index f96cbd04e284..38634cd11413 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -362,7 +362,7 @@ static void pc_q35_machine_options(MachineClass *m)
m->max_cpus = 288;
}
-static void pc_q35_7_1_machine_options(MachineClass *m)
+static void pc_q35_7_2_machine_options(MachineClass *m)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_q35_machine_options(m);
@@ -370,6 +370,17 @@ static void pc_q35_7_1_machine_options(MachineClass *m)
pcmc->default_cpu_version = 1;
}
+DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL,
+ pc_q35_7_2_machine_options);
+
+static void pc_q35_7_1_machine_options(MachineClass *m)
+{
+ pc_q35_7_2_machine_options(m);
+ m->alias = NULL;
+ compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len);
+ compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len);
+}
+
DEFINE_Q35_MACHINE(v7_1, "pc-q35-7.1", NULL,
pc_q35_7_1_machine_options);
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 0aa383fa6bda..3122c8ef2c38 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -322,10 +322,17 @@ type_init(virt_machine_register_types)
} \
type_init(machvirt_machine_##major##_##minor##_init);
+static void virt_machine_7_2_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE(7, 2, true)
+
static void virt_machine_7_1_options(MachineClass *mc)
{
+ virt_machine_7_2_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len);
}
-DEFINE_VIRT_MACHINE(7, 1, true)
+DEFINE_VIRT_MACHINE(7, 1, false)
static void virt_machine_7_0_options(MachineClass *mc)
{
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index bc9ba6e6dcf2..fb790b61e442 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -4730,15 +4730,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
} \
type_init(spapr_machine_register_##suffix)
+/*
+ * pseries-7.2
+ */
+static void spapr_machine_7_2_class_options(MachineClass *mc)
+{
+ /* Defaults for the latest behaviour inherited from the base class */
+}
+
+DEFINE_SPAPR_MACHINE(7_2, "7.2", true);
+
/*
* pseries-7.1
*/
static void spapr_machine_7_1_class_options(MachineClass *mc)
{
- /* Defaults for the latest behaviour inherited from the base class */
+ spapr_machine_7_2_class_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len);
}
-DEFINE_SPAPR_MACHINE(7_1, "7.1", true);
+DEFINE_SPAPR_MACHINE(7_1, "7.1", false);
/*
* pseries-7.0
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index cc3097bfee80..bf1b36d824db 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -792,14 +792,26 @@ bool css_migration_enabled(void)
} \
type_init(ccw_machine_register_##suffix)
+static void ccw_machine_7_2_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_7_2_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(7_2, "7.2", true);
+
static void ccw_machine_7_1_instance_options(MachineState *machine)
{
+ ccw_machine_7_2_instance_options(machine);
}
static void ccw_machine_7_1_class_options(MachineClass *mc)
{
+ ccw_machine_7_2_class_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len);
}
-DEFINE_CCW_MACHINE(7_1, "7.1", true);
+DEFINE_CCW_MACHINE(7_1, "7.1", false);
static void ccw_machine_7_0_instance_options(MachineState *machine)
{
diff --git a/include/hw/boards.h b/include/hw/boards.h
index d94edcef2883..487243a39c84 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -380,6 +380,9 @@ struct MachineState {
} \
type_init(machine_initfn##_register_types)
+extern GlobalProperty hw_compat_7_1[];
+extern const size_t hw_compat_7_1_len;
+
extern GlobalProperty hw_compat_7_0[];
extern const size_t hw_compat_7_0_len;
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index b7735dccfc81..4517fa08f2e9 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -195,6 +195,9 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
/* sgx.c */
void pc_machine_init_sgx_epc(PCMachineState *pcms);
+extern GlobalProperty pc_compat_7_1[];
+extern const size_t pc_compat_7_1_len;
+
extern GlobalProperty pc_compat_7_0[];
extern const size_t pc_compat_7_0_len;
--
2.35.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH for-7.2] hw: Add compat machines for 7.2
2022-07-27 12:17 [PATCH for-7.2] hw: Add compat machines for 7.2 Cornelia Huck
@ 2022-07-28 13:21 ` Daniel Henrique Barboza
2022-07-28 13:40 ` Michael S. Tsirkin
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Henrique Barboza @ 2022-07-28 13:21 UTC (permalink / raw)
To: Cornelia Huck, Peter Maydell, Eduardo Habkost, Marcel Apfelbaum,
Philippe Mathieu-Daudé,
Yanan Wang, Paolo Bonzini, Richard Henderson, Michael S. Tsirkin,
Laurent Vivier, Cédric Le Goater, David Gibson, Greg Kurz,
Thomas Huth, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Eric Farman
Cc: qemu-arm, qemu-devel, qemu-ppc, qemu-s390x
On 7/27/22 09:17, Cornelia Huck wrote:
> Add 7.2 machine types for arm/i440fx/m68k/q35/s390x/spapr.
>
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
Looking good for pseries.
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
> hw/arm/virt.c | 9 ++++++++-
> hw/core/machine.c | 3 +++
> hw/i386/pc.c | 3 +++
> hw/i386/pc_piix.c | 14 +++++++++++++-
> hw/i386/pc_q35.c | 13 ++++++++++++-
> hw/m68k/virt.c | 9 ++++++++-
> hw/ppc/spapr.c | 15 +++++++++++++--
> hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
> include/hw/boards.h | 3 +++
> include/hw/i386/pc.h | 3 +++
> 10 files changed, 79 insertions(+), 7 deletions(-)
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 9633f822f361..1a6480fd2a76 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -3094,10 +3094,17 @@ static void machvirt_machine_init(void)
> }
> type_init(machvirt_machine_init);
>
> +static void virt_machine_7_2_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE_AS_LATEST(7, 2)
> +
> static void virt_machine_7_1_options(MachineClass *mc)
> {
> + virt_machine_7_2_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len);
> }
> -DEFINE_VIRT_MACHINE_AS_LATEST(7, 1)
> +DEFINE_VIRT_MACHINE(7, 1)
>
> static void virt_machine_7_0_options(MachineClass *mc)
> {
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index a673302ccec5..aa520e74a8c8 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -40,6 +40,9 @@
> #include "hw/virtio/virtio-pci.h"
> #include "qom/object_interfaces.h"
>
> +GlobalProperty hw_compat_7_1[] = {};
> +const size_t hw_compat_7_1_len = G_N_ELEMENTS(hw_compat_7_1);
> +
> GlobalProperty hw_compat_7_0[] = {
> { "arm-gicv3-common", "force-8-bit-prio", "on" },
> { "nvme-ns", "eui64-default", "on"},
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 774cb2bf0748..31724c42ac90 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -107,6 +107,9 @@
> { "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\
> { "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },
>
> +GlobalProperty pc_compat_7_1[] = {};
> +const size_t pc_compat_7_1_len = G_N_ELEMENTS(pc_compat_7_1);
> +
> GlobalProperty pc_compat_7_0[] = {};
> const size_t pc_compat_7_0_len = G_N_ELEMENTS(pc_compat_7_0);
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index a234989ac363..34fa0021c7be 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_VMBUS_BRIDGE);
> }
>
> -static void pc_i440fx_7_1_machine_options(MachineClass *m)
> +static void pc_i440fx_7_2_machine_options(MachineClass *m)
> {
> PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> pc_i440fx_machine_options(m);
> @@ -433,6 +433,18 @@ static void pc_i440fx_7_1_machine_options(MachineClass *m)
> pcmc->default_cpu_version = 1;
> }
>
> +DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL,
> + pc_i440fx_7_2_machine_options);
> +
> +static void pc_i440fx_7_1_machine_options(MachineClass *m)
> +{
> + pc_i440fx_7_2_machine_options(m);
> + m->alias = NULL;
> + m->is_default = false;
> + compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len);
> + compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len);
> +}
> +
> DEFINE_I440FX_MACHINE(v7_1, "pc-i440fx-7.1", NULL,
> pc_i440fx_7_1_machine_options);
>
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index f96cbd04e284..38634cd11413 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -362,7 +362,7 @@ static void pc_q35_machine_options(MachineClass *m)
> m->max_cpus = 288;
> }
>
> -static void pc_q35_7_1_machine_options(MachineClass *m)
> +static void pc_q35_7_2_machine_options(MachineClass *m)
> {
> PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> pc_q35_machine_options(m);
> @@ -370,6 +370,17 @@ static void pc_q35_7_1_machine_options(MachineClass *m)
> pcmc->default_cpu_version = 1;
> }
>
> +DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL,
> + pc_q35_7_2_machine_options);
> +
> +static void pc_q35_7_1_machine_options(MachineClass *m)
> +{
> + pc_q35_7_2_machine_options(m);
> + m->alias = NULL;
> + compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len);
> + compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len);
> +}
> +
> DEFINE_Q35_MACHINE(v7_1, "pc-q35-7.1", NULL,
> pc_q35_7_1_machine_options);
>
> diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
> index 0aa383fa6bda..3122c8ef2c38 100644
> --- a/hw/m68k/virt.c
> +++ b/hw/m68k/virt.c
> @@ -322,10 +322,17 @@ type_init(virt_machine_register_types)
> } \
> type_init(machvirt_machine_##major##_##minor##_init);
>
> +static void virt_machine_7_2_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE(7, 2, true)
> +
> static void virt_machine_7_1_options(MachineClass *mc)
> {
> + virt_machine_7_2_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len);
> }
> -DEFINE_VIRT_MACHINE(7, 1, true)
> +DEFINE_VIRT_MACHINE(7, 1, false)
>
> static void virt_machine_7_0_options(MachineClass *mc)
> {
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index bc9ba6e6dcf2..fb790b61e442 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4730,15 +4730,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
> } \
> type_init(spapr_machine_register_##suffix)
>
> +/*
> + * pseries-7.2
> + */
> +static void spapr_machine_7_2_class_options(MachineClass *mc)
> +{
> + /* Defaults for the latest behaviour inherited from the base class */
> +}
> +
> +DEFINE_SPAPR_MACHINE(7_2, "7.2", true);
> +
> /*
> * pseries-7.1
> */
> static void spapr_machine_7_1_class_options(MachineClass *mc)
> {
> - /* Defaults for the latest behaviour inherited from the base class */
> + spapr_machine_7_2_class_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len);
> }
>
> -DEFINE_SPAPR_MACHINE(7_1, "7.1", true);
> +DEFINE_SPAPR_MACHINE(7_1, "7.1", false);
>
> /*
> * pseries-7.0
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index cc3097bfee80..bf1b36d824db 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -792,14 +792,26 @@ bool css_migration_enabled(void)
> } \
> type_init(ccw_machine_register_##suffix)
>
> +static void ccw_machine_7_2_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_7_2_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(7_2, "7.2", true);
> +
> static void ccw_machine_7_1_instance_options(MachineState *machine)
> {
> + ccw_machine_7_2_instance_options(machine);
> }
>
> static void ccw_machine_7_1_class_options(MachineClass *mc)
> {
> + ccw_machine_7_2_class_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len);
> }
> -DEFINE_CCW_MACHINE(7_1, "7.1", true);
> +DEFINE_CCW_MACHINE(7_1, "7.1", false);
>
> static void ccw_machine_7_0_instance_options(MachineState *machine)
> {
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index d94edcef2883..487243a39c84 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -380,6 +380,9 @@ struct MachineState {
> } \
> type_init(machine_initfn##_register_types)
>
> +extern GlobalProperty hw_compat_7_1[];
> +extern const size_t hw_compat_7_1_len;
> +
> extern GlobalProperty hw_compat_7_0[];
> extern const size_t hw_compat_7_0_len;
>
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index b7735dccfc81..4517fa08f2e9 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -195,6 +195,9 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
> /* sgx.c */
> void pc_machine_init_sgx_epc(PCMachineState *pcms);
>
> +extern GlobalProperty pc_compat_7_1[];
> +extern const size_t pc_compat_7_1_len;
> +
> extern GlobalProperty pc_compat_7_0[];
> extern const size_t pc_compat_7_0_len;
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH for-7.2] hw: Add compat machines for 7.2
2022-07-27 12:17 [PATCH for-7.2] hw: Add compat machines for 7.2 Cornelia Huck
2022-07-28 13:21 ` Daniel Henrique Barboza
@ 2022-07-28 13:40 ` Michael S. Tsirkin
1 sibling, 0 replies; 3+ messages in thread
From: Michael S. Tsirkin @ 2022-07-28 13:40 UTC (permalink / raw)
To: Cornelia Huck
Cc: Peter Maydell, Eduardo Habkost, Marcel Apfelbaum,
Philippe Mathieu-Daudé,
Yanan Wang, Paolo Bonzini, Richard Henderson, Laurent Vivier,
Cédric Le Goater, Daniel Henrique Barboza, David Gibson,
Greg Kurz, Thomas Huth, David Hildenbrand, Halil Pasic,
Christian Borntraeger, Eric Farman, qemu-arm, qemu-devel,
qemu-ppc, qemu-s390x
On Wed, Jul 27, 2022 at 02:17:55PM +0200, Cornelia Huck wrote:
> Add 7.2 machine types for arm/i440fx/m68k/q35/s390x/spapr.
>
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
whoever needs this first, feel free to merge.
> ---
> hw/arm/virt.c | 9 ++++++++-
> hw/core/machine.c | 3 +++
> hw/i386/pc.c | 3 +++
> hw/i386/pc_piix.c | 14 +++++++++++++-
> hw/i386/pc_q35.c | 13 ++++++++++++-
> hw/m68k/virt.c | 9 ++++++++-
> hw/ppc/spapr.c | 15 +++++++++++++--
> hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
> include/hw/boards.h | 3 +++
> include/hw/i386/pc.h | 3 +++
> 10 files changed, 79 insertions(+), 7 deletions(-)
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 9633f822f361..1a6480fd2a76 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -3094,10 +3094,17 @@ static void machvirt_machine_init(void)
> }
> type_init(machvirt_machine_init);
>
> +static void virt_machine_7_2_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE_AS_LATEST(7, 2)
> +
> static void virt_machine_7_1_options(MachineClass *mc)
> {
> + virt_machine_7_2_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len);
> }
> -DEFINE_VIRT_MACHINE_AS_LATEST(7, 1)
> +DEFINE_VIRT_MACHINE(7, 1)
>
> static void virt_machine_7_0_options(MachineClass *mc)
> {
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index a673302ccec5..aa520e74a8c8 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -40,6 +40,9 @@
> #include "hw/virtio/virtio-pci.h"
> #include "qom/object_interfaces.h"
>
> +GlobalProperty hw_compat_7_1[] = {};
> +const size_t hw_compat_7_1_len = G_N_ELEMENTS(hw_compat_7_1);
> +
> GlobalProperty hw_compat_7_0[] = {
> { "arm-gicv3-common", "force-8-bit-prio", "on" },
> { "nvme-ns", "eui64-default", "on"},
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 774cb2bf0748..31724c42ac90 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -107,6 +107,9 @@
> { "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\
> { "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },
>
> +GlobalProperty pc_compat_7_1[] = {};
> +const size_t pc_compat_7_1_len = G_N_ELEMENTS(pc_compat_7_1);
> +
> GlobalProperty pc_compat_7_0[] = {};
> const size_t pc_compat_7_0_len = G_N_ELEMENTS(pc_compat_7_0);
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index a234989ac363..34fa0021c7be 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_VMBUS_BRIDGE);
> }
>
> -static void pc_i440fx_7_1_machine_options(MachineClass *m)
> +static void pc_i440fx_7_2_machine_options(MachineClass *m)
> {
> PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> pc_i440fx_machine_options(m);
> @@ -433,6 +433,18 @@ static void pc_i440fx_7_1_machine_options(MachineClass *m)
> pcmc->default_cpu_version = 1;
> }
>
> +DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL,
> + pc_i440fx_7_2_machine_options);
> +
> +static void pc_i440fx_7_1_machine_options(MachineClass *m)
> +{
> + pc_i440fx_7_2_machine_options(m);
> + m->alias = NULL;
> + m->is_default = false;
> + compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len);
> + compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len);
> +}
> +
> DEFINE_I440FX_MACHINE(v7_1, "pc-i440fx-7.1", NULL,
> pc_i440fx_7_1_machine_options);
>
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index f96cbd04e284..38634cd11413 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -362,7 +362,7 @@ static void pc_q35_machine_options(MachineClass *m)
> m->max_cpus = 288;
> }
>
> -static void pc_q35_7_1_machine_options(MachineClass *m)
> +static void pc_q35_7_2_machine_options(MachineClass *m)
> {
> PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> pc_q35_machine_options(m);
> @@ -370,6 +370,17 @@ static void pc_q35_7_1_machine_options(MachineClass *m)
> pcmc->default_cpu_version = 1;
> }
>
> +DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL,
> + pc_q35_7_2_machine_options);
> +
> +static void pc_q35_7_1_machine_options(MachineClass *m)
> +{
> + pc_q35_7_2_machine_options(m);
> + m->alias = NULL;
> + compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len);
> + compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len);
> +}
> +
> DEFINE_Q35_MACHINE(v7_1, "pc-q35-7.1", NULL,
> pc_q35_7_1_machine_options);
>
> diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
> index 0aa383fa6bda..3122c8ef2c38 100644
> --- a/hw/m68k/virt.c
> +++ b/hw/m68k/virt.c
> @@ -322,10 +322,17 @@ type_init(virt_machine_register_types)
> } \
> type_init(machvirt_machine_##major##_##minor##_init);
>
> +static void virt_machine_7_2_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE(7, 2, true)
> +
> static void virt_machine_7_1_options(MachineClass *mc)
> {
> + virt_machine_7_2_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len);
> }
> -DEFINE_VIRT_MACHINE(7, 1, true)
> +DEFINE_VIRT_MACHINE(7, 1, false)
>
> static void virt_machine_7_0_options(MachineClass *mc)
> {
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index bc9ba6e6dcf2..fb790b61e442 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4730,15 +4730,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
> } \
> type_init(spapr_machine_register_##suffix)
>
> +/*
> + * pseries-7.2
> + */
> +static void spapr_machine_7_2_class_options(MachineClass *mc)
> +{
> + /* Defaults for the latest behaviour inherited from the base class */
> +}
> +
> +DEFINE_SPAPR_MACHINE(7_2, "7.2", true);
> +
> /*
> * pseries-7.1
> */
> static void spapr_machine_7_1_class_options(MachineClass *mc)
> {
> - /* Defaults for the latest behaviour inherited from the base class */
> + spapr_machine_7_2_class_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len);
> }
>
> -DEFINE_SPAPR_MACHINE(7_1, "7.1", true);
> +DEFINE_SPAPR_MACHINE(7_1, "7.1", false);
>
> /*
> * pseries-7.0
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index cc3097bfee80..bf1b36d824db 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -792,14 +792,26 @@ bool css_migration_enabled(void)
> } \
> type_init(ccw_machine_register_##suffix)
>
> +static void ccw_machine_7_2_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_7_2_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(7_2, "7.2", true);
> +
> static void ccw_machine_7_1_instance_options(MachineState *machine)
> {
> + ccw_machine_7_2_instance_options(machine);
> }
>
> static void ccw_machine_7_1_class_options(MachineClass *mc)
> {
> + ccw_machine_7_2_class_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len);
> }
> -DEFINE_CCW_MACHINE(7_1, "7.1", true);
> +DEFINE_CCW_MACHINE(7_1, "7.1", false);
>
> static void ccw_machine_7_0_instance_options(MachineState *machine)
> {
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index d94edcef2883..487243a39c84 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -380,6 +380,9 @@ struct MachineState {
> } \
> type_init(machine_initfn##_register_types)
>
> +extern GlobalProperty hw_compat_7_1[];
> +extern const size_t hw_compat_7_1_len;
> +
> extern GlobalProperty hw_compat_7_0[];
> extern const size_t hw_compat_7_0_len;
>
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index b7735dccfc81..4517fa08f2e9 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -195,6 +195,9 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
> /* sgx.c */
> void pc_machine_init_sgx_epc(PCMachineState *pcms);
>
> +extern GlobalProperty pc_compat_7_1[];
> +extern const size_t pc_compat_7_1_len;
> +
> extern GlobalProperty pc_compat_7_0[];
> extern const size_t pc_compat_7_0_len;
>
> --
> 2.35.3
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-28 14:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-27 12:17 [PATCH for-7.2] hw: Add compat machines for 7.2 Cornelia Huck
2022-07-28 13:21 ` Daniel Henrique Barboza
2022-07-28 13:40 ` Michael S. Tsirkin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.