* [PATCH for-11.1] hw: add compat machines for 11.1
@ 2026-03-31 14:03 Cornelia Huck
2026-04-01 16:44 ` Eric Farman
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Cornelia Huck @ 2026-03-31 14:03 UTC (permalink / raw)
To: qemu-arm, qemu-devel, qemu-ppc, qemu-s390x
Cc: Peter Maydell, Marcel Apfelbaum, Philippe Mathieu-Daudé,
Yanan Wang, Zhao Liu, Michael S. Tsirkin, Paolo Bonzini,
Richard Henderson, Laurent Vivier, Nicholas Piggin,
Harsh Prateek Bora, Halil Pasic, Christian Borntraeger,
Eric Farman, Matthew Rosato, Ilya Leoshkevich, David Hildenbrand,
Cornelia Huck
Add 11.1 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 | 13 +++++++++++--
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/core/boards.h | 3 +++
include/hw/i386/pc.h | 3 +++
10 files changed, 76 insertions(+), 9 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index ec0d8475ca40..d7e68d42ce02 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3719,10 +3719,17 @@ static void machvirt_machine_init(void)
}
type_init(machvirt_machine_init);
+static void virt_machine_11_1_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE_AS_LATEST(11, 1)
+
static void virt_machine_11_0_options(MachineClass *mc)
{
+ virt_machine_11_1_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_11_0, hw_compat_11_0_len);
}
-DEFINE_VIRT_MACHINE_AS_LATEST(11, 0)
+DEFINE_VIRT_MACHINE(11, 0)
static void virt_machine_10_2_options(MachineClass *mc)
{
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 0aa77a57e956..1abc8ae73739 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -38,6 +38,9 @@
#include "hw/acpi/generic_event_device.h"
#include "qemu/audio.h"
+GlobalProperty hw_compat_11_0[] = {};
+const size_t hw_compat_11_0_len = G_N_ELEMENTS(hw_compat_11_0);
+
GlobalProperty hw_compat_10_2[] = {
{ "scsi-block", "migrate-pr", "off" },
{ "isa-cirrus-vga", "global-vmstate", "true" },
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 4b53b5be4a96..2ecad3c503fb 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -73,6 +73,9 @@
#include "hw/xen/xen-bus.h"
#endif
+GlobalProperty pc_compat_11_0[] = {};
+const size_t pc_compat_11_0_len = G_N_ELEMENTS(pc_compat_11_0);
+
GlobalProperty pc_compat_10_2[] = {};
const size_t pc_compat_10_2_len = G_N_ELEMENTS(pc_compat_10_2);
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 4d71e0d51a28..82457bdb167a 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -428,12 +428,21 @@ static void pc_i440fx_machine_options(MachineClass *m)
pc_piix_compat_defaults, pc_piix_compat_defaults_len);
}
-static void pc_i440fx_machine_11_0_options(MachineClass *m)
+static void pc_i440fx_machine_11_1_options(MachineClass *m)
{
pc_i440fx_machine_options(m);
}
-DEFINE_I440FX_MACHINE_AS_LATEST(11, 0);
+DEFINE_I440FX_MACHINE_AS_LATEST(11, 1);
+
+static void pc_i440fx_machine_11_0_options(MachineClass *m)
+{
+ pc_i440fx_machine_11_1_options(m);
+ compat_props_add(m->compat_props, hw_compat_11_0, hw_compat_11_0_len);
+ compat_props_add(m->compat_props, pc_compat_11_0, pc_compat_11_0_len);
+}
+
+DEFINE_I440FX_MACHINE(11, 0);
static void pc_i440fx_machine_10_2_options(MachineClass *m)
{
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index cb23322f5a44..972dd9275f68 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -364,12 +364,21 @@ static void pc_q35_machine_options(MachineClass *m)
pc_q35_compat_defaults, pc_q35_compat_defaults_len);
}
-static void pc_q35_machine_11_0_options(MachineClass *m)
+static void pc_q35_machine_11_1_options(MachineClass *m)
{
pc_q35_machine_options(m);
}
-DEFINE_Q35_MACHINE_AS_LATEST(11, 0);
+DEFINE_Q35_MACHINE_AS_LATEST(11, 1);
+
+static void pc_q35_machine_11_0_options(MachineClass *m)
+{
+ pc_q35_machine_11_1_options(m);
+ compat_props_add(m->compat_props, hw_compat_11_0, hw_compat_11_0_len);
+ compat_props_add(m->compat_props, pc_compat_11_0, pc_compat_11_0_len);
+}
+
+DEFINE_Q35_MACHINE(11, 0);
static void pc_q35_machine_10_2_options(MachineClass *m)
{
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index ffe6e234155b..96c0fb73fea5 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -367,10 +367,17 @@ type_init(virt_machine_register_types)
#define DEFINE_VIRT_MACHINE(major, minor) \
DEFINE_VIRT_MACHINE_IMPL(false, major, minor)
+static void virt_machine_11_1_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE_AS_LATEST(11, 1)
+
static void virt_machine_11_0_options(MachineClass *mc)
{
+ virt_machine_11_1_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_11_0, hw_compat_11_0_len);
}
-DEFINE_VIRT_MACHINE_AS_LATEST(11, 0)
+DEFINE_VIRT_MACHINE(11, 0)
static void virt_machine_10_2_options(MachineClass *mc)
{
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 0ab39dfea6b8..428b491a7df1 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -4760,15 +4760,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
#define DEFINE_SPAPR_MACHINE(major, minor) \
DEFINE_SPAPR_MACHINE_IMPL(false, major, minor)
+/*
+ * pseries-11.1
+ */
+static void spapr_machine_11_1_class_options(MachineClass *mc)
+{
+ /* Defaults for the latest behaviour inherited from the base class */
+}
+
+DEFINE_SPAPR_MACHINE_AS_LATEST(11, 1);
+
/*
* pseries-11.0
*/
static void spapr_machine_11_0_class_options(MachineClass *mc)
{
- /* Defaults for the latest behaviour inherited from the base class */
+ spapr_machine_11_1_class_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_11_0, hw_compat_11_0_len);
}
-DEFINE_SPAPR_MACHINE_AS_LATEST(11, 0);
+DEFINE_SPAPR_MACHINE(11, 0);
/*
* pseries-10.2
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 3ef009463d11..cc768daeb04c 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -907,14 +907,26 @@ static const TypeInfo ccw_machine_info = {
DEFINE_CCW_MACHINE_IMPL(false, major, minor)
+static void ccw_machine_11_1_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_11_1_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE_AS_LATEST(11, 1);
+
static void ccw_machine_11_0_instance_options(MachineState *machine)
{
+ ccw_machine_11_1_instance_options(machine);
}
static void ccw_machine_11_0_class_options(MachineClass *mc)
{
+ ccw_machine_11_1_class_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_11_0, hw_compat_11_0_len);
}
-DEFINE_CCW_MACHINE_AS_LATEST(11, 0);
+DEFINE_CCW_MACHINE(11, 0);
static void ccw_machine_10_2_instance_options(MachineState *machine)
{
diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h
index b8dad0a1074d..db83fe92922b 100644
--- a/include/hw/core/boards.h
+++ b/include/hw/core/boards.h
@@ -798,6 +798,9 @@ struct MachineState {
} \
} while (0)
+extern GlobalProperty hw_compat_11_0[];
+extern const size_t hw_compat_11_0_len;
+
extern GlobalProperty hw_compat_10_2[];
extern const size_t hw_compat_10_2_len;
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 22325324d094..85a74363b52e 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -208,6 +208,9 @@ void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size);
/* sgx.c */
void pc_machine_init_sgx_epc(PCMachineState *pcms);
+extern GlobalProperty pc_compat_11_0[];
+extern const size_t pc_compat_11_0_len;
+
extern GlobalProperty pc_compat_10_2[];
extern const size_t pc_compat_10_2_len;
--
2.53.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH for-11.1] hw: add compat machines for 11.1
2026-03-31 14:03 [PATCH for-11.1] hw: add compat machines for 11.1 Cornelia Huck
@ 2026-04-01 16:44 ` Eric Farman
2026-04-17 15:15 ` Cornelia Huck
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Eric Farman @ 2026-04-01 16:44 UTC (permalink / raw)
To: Cornelia Huck, qemu-arm, qemu-devel, qemu-ppc, qemu-s390x
Cc: Peter Maydell, Marcel Apfelbaum, Philippe Mathieu-Daudé,
Yanan Wang, Zhao Liu, Michael S. Tsirkin, Paolo Bonzini,
Richard Henderson, Laurent Vivier, Nicholas Piggin,
Harsh Prateek Bora, Halil Pasic, Christian Borntraeger,
Matthew Rosato, Ilya Leoshkevich, David Hildenbrand
On Tue, 2026-03-31 at 16:03 +0200, Cornelia Huck wrote:
> Add 11.1 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 | 13 +++++++++++--
> 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/core/boards.h | 3 +++
> include/hw/i386/pc.h | 3 +++
> 10 files changed, 76 insertions(+), 9 deletions(-)
Reviewed-by: Eric Farman <farman@linux.ibm.com> # s390
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH for-11.1] hw: add compat machines for 11.1
2026-03-31 14:03 [PATCH for-11.1] hw: add compat machines for 11.1 Cornelia Huck
2026-04-01 16:44 ` Eric Farman
@ 2026-04-17 15:15 ` Cornelia Huck
2026-04-24 19:18 ` Philippe Mathieu-Daudé
2026-04-24 19:18 ` Michael S. Tsirkin
3 siblings, 0 replies; 7+ messages in thread
From: Cornelia Huck @ 2026-04-17 15:15 UTC (permalink / raw)
To: qemu-arm, qemu-devel, qemu-ppc, qemu-s390x
Cc: Peter Maydell, Marcel Apfelbaum, Philippe Mathieu-Daudé,
Yanan Wang, Zhao Liu, Michael S. Tsirkin, Paolo Bonzini,
Richard Henderson, Laurent Vivier, Nicholas Piggin,
Harsh Prateek Bora, Halil Pasic, Christian Borntraeger,
Eric Farman, Matthew Rosato, Ilya Leoshkevich, David Hildenbrand
On Tue, Mar 31 2026, Cornelia Huck <cohuck@redhat.com> wrote:
> Add 11.1 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 | 13 +++++++++++--
> 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/core/boards.h | 3 +++
> include/hw/i386/pc.h | 3 +++
> 10 files changed, 76 insertions(+), 9 deletions(-)
Queued to s390-next.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH for-11.1] hw: add compat machines for 11.1
2026-03-31 14:03 [PATCH for-11.1] hw: add compat machines for 11.1 Cornelia Huck
2026-04-01 16:44 ` Eric Farman
2026-04-17 15:15 ` Cornelia Huck
@ 2026-04-24 19:18 ` Philippe Mathieu-Daudé
2026-04-27 7:27 ` Cornelia Huck
2026-04-24 19:18 ` Michael S. Tsirkin
3 siblings, 1 reply; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-04-24 19:18 UTC (permalink / raw)
To: Cornelia Huck, qemu-arm, qemu-devel, qemu-ppc, qemu-s390x
Cc: Peter Maydell, Marcel Apfelbaum, Yanan Wang, Zhao Liu,
Michael S. Tsirkin, Paolo Bonzini, Richard Henderson,
Laurent Vivier, Nicholas Piggin, Harsh Prateek Bora, Halil Pasic,
Christian Borntraeger, Eric Farman, Matthew Rosato,
Ilya Leoshkevich, David Hildenbrand
Hi Connie,
On 31/3/26 16:03, Cornelia Huck wrote:
> Add 11.1 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 | 13 +++++++++++--
> 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/core/boards.h | 3 +++
> include/hw/i386/pc.h | 3 +++
> 10 files changed, 76 insertions(+), 9 deletions(-)
I'll take this patch in my next PR to avoid another conflict
with your tree.
Regards,
Phil.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH for-11.1] hw: add compat machines for 11.1
2026-03-31 14:03 [PATCH for-11.1] hw: add compat machines for 11.1 Cornelia Huck
` (2 preceding siblings ...)
2026-04-24 19:18 ` Philippe Mathieu-Daudé
@ 2026-04-24 19:18 ` Michael S. Tsirkin
3 siblings, 0 replies; 7+ messages in thread
From: Michael S. Tsirkin @ 2026-04-24 19:18 UTC (permalink / raw)
To: Cornelia Huck
Cc: qemu-arm, qemu-devel, qemu-ppc, qemu-s390x, Peter Maydell,
Marcel Apfelbaum, Philippe Mathieu-Daudé, Yanan Wang,
Zhao Liu, Paolo Bonzini, Richard Henderson, Laurent Vivier,
Nicholas Piggin, Harsh Prateek Bora, Halil Pasic,
Christian Borntraeger, Eric Farman, Matthew Rosato,
Ilya Leoshkevich, David Hildenbrand
On Tue, Mar 31, 2026 at 04:03:47PM +0200, Cornelia Huck wrote:
> Add 11.1 machine types for arm/i440fx/m68k/q35/s390x/spapr.
>
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> hw/arm/virt.c | 9 ++++++++-
> hw/core/machine.c | 3 +++
> hw/i386/pc.c | 3 +++
> hw/i386/pc_piix.c | 13 +++++++++++--
> 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/core/boards.h | 3 +++
> include/hw/i386/pc.h | 3 +++
> 10 files changed, 76 insertions(+), 9 deletions(-)
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index ec0d8475ca40..d7e68d42ce02 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -3719,10 +3719,17 @@ static void machvirt_machine_init(void)
> }
> type_init(machvirt_machine_init);
>
> +static void virt_machine_11_1_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE_AS_LATEST(11, 1)
> +
> static void virt_machine_11_0_options(MachineClass *mc)
> {
> + virt_machine_11_1_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_11_0, hw_compat_11_0_len);
> }
> -DEFINE_VIRT_MACHINE_AS_LATEST(11, 0)
> +DEFINE_VIRT_MACHINE(11, 0)
>
> static void virt_machine_10_2_options(MachineClass *mc)
> {
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 0aa77a57e956..1abc8ae73739 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -38,6 +38,9 @@
> #include "hw/acpi/generic_event_device.h"
> #include "qemu/audio.h"
>
> +GlobalProperty hw_compat_11_0[] = {};
> +const size_t hw_compat_11_0_len = G_N_ELEMENTS(hw_compat_11_0);
> +
> GlobalProperty hw_compat_10_2[] = {
> { "scsi-block", "migrate-pr", "off" },
> { "isa-cirrus-vga", "global-vmstate", "true" },
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 4b53b5be4a96..2ecad3c503fb 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -73,6 +73,9 @@
> #include "hw/xen/xen-bus.h"
> #endif
>
> +GlobalProperty pc_compat_11_0[] = {};
> +const size_t pc_compat_11_0_len = G_N_ELEMENTS(pc_compat_11_0);
> +
> GlobalProperty pc_compat_10_2[] = {};
> const size_t pc_compat_10_2_len = G_N_ELEMENTS(pc_compat_10_2);
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 4d71e0d51a28..82457bdb167a 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -428,12 +428,21 @@ static void pc_i440fx_machine_options(MachineClass *m)
> pc_piix_compat_defaults, pc_piix_compat_defaults_len);
> }
>
> -static void pc_i440fx_machine_11_0_options(MachineClass *m)
> +static void pc_i440fx_machine_11_1_options(MachineClass *m)
> {
> pc_i440fx_machine_options(m);
> }
>
> -DEFINE_I440FX_MACHINE_AS_LATEST(11, 0);
> +DEFINE_I440FX_MACHINE_AS_LATEST(11, 1);
> +
> +static void pc_i440fx_machine_11_0_options(MachineClass *m)
> +{
> + pc_i440fx_machine_11_1_options(m);
> + compat_props_add(m->compat_props, hw_compat_11_0, hw_compat_11_0_len);
> + compat_props_add(m->compat_props, pc_compat_11_0, pc_compat_11_0_len);
> +}
> +
> +DEFINE_I440FX_MACHINE(11, 0);
>
> static void pc_i440fx_machine_10_2_options(MachineClass *m)
> {
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index cb23322f5a44..972dd9275f68 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -364,12 +364,21 @@ static void pc_q35_machine_options(MachineClass *m)
> pc_q35_compat_defaults, pc_q35_compat_defaults_len);
> }
>
> -static void pc_q35_machine_11_0_options(MachineClass *m)
> +static void pc_q35_machine_11_1_options(MachineClass *m)
> {
> pc_q35_machine_options(m);
> }
>
> -DEFINE_Q35_MACHINE_AS_LATEST(11, 0);
> +DEFINE_Q35_MACHINE_AS_LATEST(11, 1);
> +
> +static void pc_q35_machine_11_0_options(MachineClass *m)
> +{
> + pc_q35_machine_11_1_options(m);
> + compat_props_add(m->compat_props, hw_compat_11_0, hw_compat_11_0_len);
> + compat_props_add(m->compat_props, pc_compat_11_0, pc_compat_11_0_len);
> +}
> +
> +DEFINE_Q35_MACHINE(11, 0);
>
> static void pc_q35_machine_10_2_options(MachineClass *m)
> {
> diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
> index ffe6e234155b..96c0fb73fea5 100644
> --- a/hw/m68k/virt.c
> +++ b/hw/m68k/virt.c
> @@ -367,10 +367,17 @@ type_init(virt_machine_register_types)
> #define DEFINE_VIRT_MACHINE(major, minor) \
> DEFINE_VIRT_MACHINE_IMPL(false, major, minor)
>
> +static void virt_machine_11_1_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE_AS_LATEST(11, 1)
> +
> static void virt_machine_11_0_options(MachineClass *mc)
> {
> + virt_machine_11_1_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_11_0, hw_compat_11_0_len);
> }
> -DEFINE_VIRT_MACHINE_AS_LATEST(11, 0)
> +DEFINE_VIRT_MACHINE(11, 0)
>
> static void virt_machine_10_2_options(MachineClass *mc)
> {
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 0ab39dfea6b8..428b491a7df1 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4760,15 +4760,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
> #define DEFINE_SPAPR_MACHINE(major, minor) \
> DEFINE_SPAPR_MACHINE_IMPL(false, major, minor)
>
> +/*
> + * pseries-11.1
> + */
> +static void spapr_machine_11_1_class_options(MachineClass *mc)
> +{
> + /* Defaults for the latest behaviour inherited from the base class */
> +}
> +
> +DEFINE_SPAPR_MACHINE_AS_LATEST(11, 1);
> +
> /*
> * pseries-11.0
> */
> static void spapr_machine_11_0_class_options(MachineClass *mc)
> {
> - /* Defaults for the latest behaviour inherited from the base class */
> + spapr_machine_11_1_class_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_11_0, hw_compat_11_0_len);
> }
>
> -DEFINE_SPAPR_MACHINE_AS_LATEST(11, 0);
> +DEFINE_SPAPR_MACHINE(11, 0);
>
> /*
> * pseries-10.2
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index 3ef009463d11..cc768daeb04c 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -907,14 +907,26 @@ static const TypeInfo ccw_machine_info = {
> DEFINE_CCW_MACHINE_IMPL(false, major, minor)
>
>
> +static void ccw_machine_11_1_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_11_1_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE_AS_LATEST(11, 1);
> +
> static void ccw_machine_11_0_instance_options(MachineState *machine)
> {
> + ccw_machine_11_1_instance_options(machine);
> }
>
> static void ccw_machine_11_0_class_options(MachineClass *mc)
> {
> + ccw_machine_11_1_class_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_11_0, hw_compat_11_0_len);
> }
> -DEFINE_CCW_MACHINE_AS_LATEST(11, 0);
> +DEFINE_CCW_MACHINE(11, 0);
>
> static void ccw_machine_10_2_instance_options(MachineState *machine)
> {
> diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h
> index b8dad0a1074d..db83fe92922b 100644
> --- a/include/hw/core/boards.h
> +++ b/include/hw/core/boards.h
> @@ -798,6 +798,9 @@ struct MachineState {
> } \
> } while (0)
>
> +extern GlobalProperty hw_compat_11_0[];
> +extern const size_t hw_compat_11_0_len;
> +
> extern GlobalProperty hw_compat_10_2[];
> extern const size_t hw_compat_10_2_len;
>
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 22325324d094..85a74363b52e 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -208,6 +208,9 @@ void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size);
> /* sgx.c */
> void pc_machine_init_sgx_epc(PCMachineState *pcms);
>
> +extern GlobalProperty pc_compat_11_0[];
> +extern const size_t pc_compat_11_0_len;
> +
> extern GlobalProperty pc_compat_10_2[];
> extern const size_t pc_compat_10_2_len;
>
> --
> 2.53.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH for-11.1] hw: add compat machines for 11.1
2026-04-24 19:18 ` Philippe Mathieu-Daudé
@ 2026-04-27 7:27 ` Cornelia Huck
2026-04-27 9:29 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 7+ messages in thread
From: Cornelia Huck @ 2026-04-27 7:27 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-arm, qemu-devel, qemu-ppc,
qemu-s390x
Cc: Peter Maydell, Marcel Apfelbaum, Yanan Wang, Zhao Liu,
Michael S. Tsirkin, Paolo Bonzini, Richard Henderson,
Laurent Vivier, Nicholas Piggin, Harsh Prateek Bora, Halil Pasic,
Christian Borntraeger, Eric Farman, Matthew Rosato,
Ilya Leoshkevich, David Hildenbrand
On Fri, Apr 24 2026, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
> Hi Connie,
>
> On 31/3/26 16:03, Cornelia Huck wrote:
>> Add 11.1 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 | 13 +++++++++++--
>> 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/core/boards.h | 3 +++
>> include/hw/i386/pc.h | 3 +++
>> 10 files changed, 76 insertions(+), 9 deletions(-)
>
> I'll take this patch in my next PR to avoid another conflict
> with your tree.
Yes, whichever one goes first.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH for-11.1] hw: add compat machines for 11.1
2026-04-27 7:27 ` Cornelia Huck
@ 2026-04-27 9:29 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-04-27 9:29 UTC (permalink / raw)
To: Cornelia Huck
Cc: qemu-arm, qemu-devel, qemu-ppc, qemu-s390x, Peter Maydell,
Marcel Apfelbaum, Yanan Wang, Zhao Liu, Michael S. Tsirkin,
Paolo Bonzini, Richard Henderson, Laurent Vivier, Nicholas Piggin,
Harsh Prateek Bora, Halil Pasic, Christian Borntraeger,
Eric Farman, Matthew Rosato, Ilya Leoshkevich, David Hildenbrand
On Mon, 27 Apr 2026 at 09:27, Cornelia Huck <cohuck@redhat.com> wrote:
>
> On Fri, Apr 24 2026, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> > Hi Connie,
> >
> > On 31/3/26 16:03, Cornelia Huck wrote:
> >> Add 11.1 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 | 13 +++++++++++--
> >> 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/core/boards.h | 3 +++
> >> include/hw/i386/pc.h | 3 +++
> >> 10 files changed, 76 insertions(+), 9 deletions(-)
> >
> > I'll take this patch in my next PR to avoid another conflict
> > with your tree.
>
> Yes, whichever one goes first.
Merged as commit 1bfa19a3fd5!
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2026-04-27 9:30 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-31 14:03 [PATCH for-11.1] hw: add compat machines for 11.1 Cornelia Huck
2026-04-01 16:44 ` Eric Farman
2026-04-17 15:15 ` Cornelia Huck
2026-04-24 19:18 ` Philippe Mathieu-Daudé
2026-04-27 7:27 ` Cornelia Huck
2026-04-27 9:29 ` Philippe Mathieu-Daudé
2026-04-24 19:18 ` 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.