Add 9.1 machine types for arm/i440fx/m68k/q35/s390x/spapr.
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>
Cc: Harsh Prateek Bora <harshpb@linux.ibm.com>
Cc: Gavin Shan <gshan@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/hw/boards.h | 3 +++
include/hw/i386/pc.h | 3 +++
hw/arm/virt.c | 11 +++++++++--
hw/core/machine.c | 3 +++
hw/i386/pc.c | 3 +++
hw/i386/pc_piix.c | 17 ++++++++++++++---
hw/i386/pc_q35.c | 14 ++++++++++++--
hw/m68k/virt.c | 11 +++++++++--
hw/ppc/spapr.c | 17 ++++++++++++++---
hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
10 files changed, 83 insertions(+), 13 deletions(-)
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 8b8f6d5c00d..50e0cf4278e 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -425,6 +425,9 @@ struct MachineState {
} \
type_init(machine_initfn##_register_types)
+extern GlobalProperty hw_compat_9_0[];
+extern const size_t hw_compat_9_0_len;
+
extern GlobalProperty hw_compat_8_2[];
extern const size_t hw_compat_8_2_len;
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 27a68071d77..349f79df086 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -198,6 +198,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_9_0[];
+extern const size_t pc_compat_9_0_len;
+
extern GlobalProperty pc_compat_8_2[];
extern const size_t pc_compat_8_2_len;
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index a9a913aeadb..c9119ef3847 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3223,10 +3223,17 @@ static void machvirt_machine_init(void)
}
type_init(machvirt_machine_init);
-static void virt_machine_9_0_options(MachineClass *mc)
+static void virt_machine_9_1_options(MachineClass *mc)
{
}
-DEFINE_VIRT_MACHINE_AS_LATEST(9, 0)
+DEFINE_VIRT_MACHINE_AS_LATEST(9, 1)
+
+static void virt_machine_9_0_options(MachineClass *mc)
+{
+ virt_machine_9_1_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_9_0, hw_compat_9_0_len);
+}
+DEFINE_VIRT_MACHINE(9, 0)
static void virt_machine_8_2_options(MachineClass *mc)
{
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 37ede0e7d4f..a92bec23147 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -33,6 +33,9 @@
#include "hw/virtio/virtio-iommu.h"
#include "audio/audio.h"
+GlobalProperty hw_compat_9_0[] = {};
+const size_t hw_compat_9_0_len = G_N_ELEMENTS(hw_compat_9_0);
+
GlobalProperty hw_compat_8_2[] = {
{ "migration", "zero-page-detection", "legacy"},
{ TYPE_VIRTIO_IOMMU_PCI, "granule", "4k" },
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index e80f02bef41..461fcaa1b48 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -78,6 +78,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_9_0[] = {};
+const size_t pc_compat_9_0_len = G_N_ELEMENTS(pc_compat_9_0);
+
GlobalProperty pc_compat_8_2[] = {};
const size_t pc_compat_8_2_len = G_N_ELEMENTS(pc_compat_8_2);
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 18ba0766092..8850c49c66a 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -513,13 +513,26 @@ static void pc_i440fx_machine_options(MachineClass *m)
"Use a different south bridge than PIIX3");
}
-static void pc_i440fx_9_0_machine_options(MachineClass *m)
+static void pc_i440fx_9_1_machine_options(MachineClass *m)
{
pc_i440fx_machine_options(m);
m->alias = "pc";
m->is_default = true;
}
+DEFINE_I440FX_MACHINE(v9_1, "pc-i440fx-9.1", NULL,
+ pc_i440fx_9_1_machine_options);
+
+static void pc_i440fx_9_0_machine_options(MachineClass *m)
+{
+ pc_i440fx_9_1_machine_options(m);
+ m->alias = NULL;
+ m->is_default = false;
+
+ compat_props_add(m->compat_props, hw_compat_9_0, hw_compat_9_0_len);
+ compat_props_add(m->compat_props, pc_compat_9_0, pc_compat_9_0_len);
+}
+
DEFINE_I440FX_MACHINE(v9_0, "pc-i440fx-9.0", NULL,
pc_i440fx_9_0_machine_options);
@@ -528,8 +541,6 @@ static void pc_i440fx_8_2_machine_options(MachineClass *m)
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_i440fx_9_0_machine_options(m);
- m->alias = NULL;
- m->is_default = false;
compat_props_add(m->compat_props, hw_compat_8_2, hw_compat_8_2_len);
compat_props_add(m->compat_props, pc_compat_8_2, pc_compat_8_2_len);
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index c7bc8a2041f..6e1180d4b60 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -365,12 +365,23 @@ static void pc_q35_machine_options(MachineClass *m)
pc_q35_compat_defaults, pc_q35_compat_defaults_len);
}
-static void pc_q35_9_0_machine_options(MachineClass *m)
+static void pc_q35_9_1_machine_options(MachineClass *m)
{
pc_q35_machine_options(m);
m->alias = "q35";
}
+DEFINE_Q35_MACHINE(v9_1, "pc-q35-9.1", NULL,
+ pc_q35_9_1_machine_options);
+
+static void pc_q35_9_0_machine_options(MachineClass *m)
+{
+ pc_q35_9_1_machine_options(m);
+ m->alias = NULL;
+ compat_props_add(m->compat_props, hw_compat_9_0, hw_compat_9_0_len);
+ compat_props_add(m->compat_props, pc_compat_9_0, pc_compat_9_0_len);
+}
+
DEFINE_Q35_MACHINE(v9_0, "pc-q35-9.0", NULL,
pc_q35_9_0_machine_options);
@@ -378,7 +389,6 @@ static void pc_q35_8_2_machine_options(MachineClass *m)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_q35_9_0_machine_options(m);
- m->alias = NULL;
m->max_cpus = 1024;
compat_props_add(m->compat_props, hw_compat_8_2, hw_compat_8_2_len);
compat_props_add(m->compat_props, pc_compat_8_2, pc_compat_8_2_len);
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index b8e5e102e6b..09bc9bdfefb 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -357,10 +357,17 @@ type_init(virt_machine_register_types)
} \
type_init(machvirt_machine_##major##_##minor##_init);
-static void virt_machine_9_0_options(MachineClass *mc)
+static void virt_machine_9_1_options(MachineClass *mc)
{
}
-DEFINE_VIRT_MACHINE(9, 0, true)
+DEFINE_VIRT_MACHINE(9, 1, true)
+
+static void virt_machine_9_0_options(MachineClass *mc)
+{
+ virt_machine_9_1_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_9_0, hw_compat_9_0_len);
+}
+DEFINE_VIRT_MACHINE(9, 0, false)
static void virt_machine_8_2_options(MachineClass *mc)
{
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index c417f9dd523..ab0cf496d61 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -4805,14 +4805,25 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
type_init(spapr_machine_register_##suffix)
/*
- * pseries-9.0
+ * pseries-9.1
*/
-static void spapr_machine_9_0_class_options(MachineClass *mc)
+static void spapr_machine_9_1_class_options(MachineClass *mc)
{
/* Defaults for the latest behaviour inherited from the base class */
}
-DEFINE_SPAPR_MACHINE(9_0, "9.0", true);
+DEFINE_SPAPR_MACHINE(9_1, "9.1", true);
+
+/*
+ * pseries-9.0
+ */
+static void spapr_machine_9_0_class_options(MachineClass *mc)
+{
+ spapr_machine_9_1_class_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_9_0, hw_compat_9_0_len);
+}
+
+DEFINE_SPAPR_MACHINE(9_0, "9.0", false);
/*
* pseries-8.2
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index b1dcb3857f0..67e8b0b05e8 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -859,14 +859,26 @@ bool css_migration_enabled(void)
} \
type_init(ccw_machine_register_##suffix)
+static void ccw_machine_9_1_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_9_1_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(9_0, "9.1", true);
+
static void ccw_machine_9_0_instance_options(MachineState *machine)
{
+ ccw_machine_9_1_instance_options(machine);
}
static void ccw_machine_9_0_class_options(MachineClass *mc)
{
+ ccw_machine_9_1_class_options(machine);
+ compat_props_add(mc->compat_props, hw_compat_9_0, hw_compat_9_0_len);
}
-DEFINE_CCW_MACHINE(9_0, "9.0", true);
+DEFINE_CCW_MACHINE(9_0, "9.0", false);
static void ccw_machine_8_2_instance_options(MachineState *machine)
{
--
2.44.0Hi Paolo,
Just meet typos when compiling ;-)
On Mon, Mar 25, 2024 at 03:14:20PM +0100, Paolo Bonzini wrote:
> Date: Mon, 25 Mar 2024 15:14:20 +0100
> From: Paolo Bonzini <pbonzini@redhat.com>
> Subject: [PATCH for-9.1 v5 1/3] hw: Add compat machines for 9.1
> X-Mailer: git-send-email 2.44.0
[snip]
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index b1dcb3857f0..67e8b0b05e8 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -859,14 +859,26 @@ bool css_migration_enabled(void)
> } \
> type_init(ccw_machine_register_##suffix)
>
> +static void ccw_machine_9_1_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_9_1_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(9_0, "9.1", true);
Should be:
DEFINE_CCW_MACHINE(9_1, "9.1", true);
> +
> static void ccw_machine_9_0_instance_options(MachineState *machine)
> {
> + ccw_machine_9_1_instance_options(machine);
> }
>
> static void ccw_machine_9_0_class_options(MachineClass *mc)
> {
> + ccw_machine_9_1_class_options(machine);
s/machine/mc/
Regards,
Zhao
On Thu, Mar 28, 2024 at 11:07 AM Zhao Liu <zhao1.liu@intel.com> wrote:
>
> Hi Paolo,
>
> Just meet typos when compiling ;-)
Thank you very much! Fixed both.
Paolo
> On Mon, Mar 25, 2024 at 03:14:20PM +0100, Paolo Bonzini wrote:
> > Date: Mon, 25 Mar 2024 15:14:20 +0100
> > From: Paolo Bonzini <pbonzini@redhat.com>
> > Subject: [PATCH for-9.1 v5 1/3] hw: Add compat machines for 9.1
> > X-Mailer: git-send-email 2.44.0
>
> [snip]
>
> > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> > index b1dcb3857f0..67e8b0b05e8 100644
> > --- a/hw/s390x/s390-virtio-ccw.c
> > +++ b/hw/s390x/s390-virtio-ccw.c
> > @@ -859,14 +859,26 @@ bool css_migration_enabled(void)
> > } \
> > type_init(ccw_machine_register_##suffix)
> >
> > +static void ccw_machine_9_1_instance_options(MachineState *machine)
> > +{
> > +}
> > +
> > +static void ccw_machine_9_1_class_options(MachineClass *mc)
> > +{
> > +}
> > +DEFINE_CCW_MACHINE(9_0, "9.1", true);
>
> Should be:
>
> DEFINE_CCW_MACHINE(9_1, "9.1", true);
>
> > +
> > static void ccw_machine_9_0_instance_options(MachineState *machine)
> > {
> > + ccw_machine_9_1_instance_options(machine);
> > }
> >
> > static void ccw_machine_9_0_class_options(MachineClass *mc)
> > {
> > + ccw_machine_9_1_class_options(machine);
>
> s/machine/mc/
>
> Regards,
> Zhao
>
On Mon, Mar 25, 2024 at 03:14:20PM +0100, Paolo Bonzini wrote: > Date: Mon, 25 Mar 2024 15:14:20 +0100 > From: Paolo Bonzini <pbonzini@redhat.com> > Subject: [PATCH for-9.1 v5 1/3] hw: Add compat machines for 9.1 > X-Mailer: git-send-email 2.44.0 > > Add 9.1 machine types for arm/i440fx/m68k/q35/s390x/spapr. > > Cc: Cornelia Huck <cohuck@redhat.com> > Cc: Thomas Huth <thuth@redhat.com> > Cc: Harsh Prateek Bora <harshpb@linux.ibm.com> > Cc: Gavin Shan <gshan@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > include/hw/boards.h | 3 +++ > include/hw/i386/pc.h | 3 +++ > hw/arm/virt.c | 11 +++++++++-- > hw/core/machine.c | 3 +++ > hw/i386/pc.c | 3 +++ > hw/i386/pc_piix.c | 17 ++++++++++++++--- > hw/i386/pc_q35.c | 14 ++++++++++++-- > hw/m68k/virt.c | 11 +++++++++-- > hw/ppc/spapr.c | 17 ++++++++++++++--- > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- > 10 files changed, 83 insertions(+), 13 deletions(-) > Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
On 3/25/24 19:44, Paolo Bonzini wrote:
> Add 9.1 machine types for arm/i440fx/m68k/q35/s390x/spapr.
>
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: Harsh Prateek Bora <harshpb@linux.ibm.com>
> Cc: Gavin Shan <gshan@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> include/hw/boards.h | 3 +++
> include/hw/i386/pc.h | 3 +++
> hw/arm/virt.c | 11 +++++++++--
> hw/core/machine.c | 3 +++
> hw/i386/pc.c | 3 +++
> hw/i386/pc_piix.c | 17 ++++++++++++++---
> hw/i386/pc_q35.c | 14 ++++++++++++--
> hw/m68k/virt.c | 11 +++++++++--
> hw/ppc/spapr.c | 17 ++++++++++++++---
For spapr:
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
> hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
> 10 files changed, 83 insertions(+), 13 deletions(-)
>
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index 8b8f6d5c00d..50e0cf4278e 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -425,6 +425,9 @@ struct MachineState {
> } \
> type_init(machine_initfn##_register_types)
>
> +extern GlobalProperty hw_compat_9_0[];
> +extern const size_t hw_compat_9_0_len;
> +
> extern GlobalProperty hw_compat_8_2[];
> extern const size_t hw_compat_8_2_len;
>
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 27a68071d77..349f79df086 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -198,6 +198,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_9_0[];
> +extern const size_t pc_compat_9_0_len;
> +
> extern GlobalProperty pc_compat_8_2[];
> extern const size_t pc_compat_8_2_len;
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index a9a913aeadb..c9119ef3847 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -3223,10 +3223,17 @@ static void machvirt_machine_init(void)
> }
> type_init(machvirt_machine_init);
>
> -static void virt_machine_9_0_options(MachineClass *mc)
> +static void virt_machine_9_1_options(MachineClass *mc)
> {
> }
> -DEFINE_VIRT_MACHINE_AS_LATEST(9, 0)
> +DEFINE_VIRT_MACHINE_AS_LATEST(9, 1)
> +
> +static void virt_machine_9_0_options(MachineClass *mc)
> +{
> + virt_machine_9_1_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_9_0, hw_compat_9_0_len);
> +}
> +DEFINE_VIRT_MACHINE(9, 0)
>
> static void virt_machine_8_2_options(MachineClass *mc)
> {
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 37ede0e7d4f..a92bec23147 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -33,6 +33,9 @@
> #include "hw/virtio/virtio-iommu.h"
> #include "audio/audio.h"
>
> +GlobalProperty hw_compat_9_0[] = {};
> +const size_t hw_compat_9_0_len = G_N_ELEMENTS(hw_compat_9_0);
> +
> GlobalProperty hw_compat_8_2[] = {
> { "migration", "zero-page-detection", "legacy"},
> { TYPE_VIRTIO_IOMMU_PCI, "granule", "4k" },
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index e80f02bef41..461fcaa1b48 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -78,6 +78,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_9_0[] = {};
> +const size_t pc_compat_9_0_len = G_N_ELEMENTS(pc_compat_9_0);
> +
> GlobalProperty pc_compat_8_2[] = {};
> const size_t pc_compat_8_2_len = G_N_ELEMENTS(pc_compat_8_2);
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 18ba0766092..8850c49c66a 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -513,13 +513,26 @@ static void pc_i440fx_machine_options(MachineClass *m)
> "Use a different south bridge than PIIX3");
> }
>
> -static void pc_i440fx_9_0_machine_options(MachineClass *m)
> +static void pc_i440fx_9_1_machine_options(MachineClass *m)
> {
> pc_i440fx_machine_options(m);
> m->alias = "pc";
> m->is_default = true;
> }
>
> +DEFINE_I440FX_MACHINE(v9_1, "pc-i440fx-9.1", NULL,
> + pc_i440fx_9_1_machine_options);
> +
> +static void pc_i440fx_9_0_machine_options(MachineClass *m)
> +{
> + pc_i440fx_9_1_machine_options(m);
> + m->alias = NULL;
> + m->is_default = false;
> +
> + compat_props_add(m->compat_props, hw_compat_9_0, hw_compat_9_0_len);
> + compat_props_add(m->compat_props, pc_compat_9_0, pc_compat_9_0_len);
> +}
> +
> DEFINE_I440FX_MACHINE(v9_0, "pc-i440fx-9.0", NULL,
> pc_i440fx_9_0_machine_options);
>
> @@ -528,8 +541,6 @@ static void pc_i440fx_8_2_machine_options(MachineClass *m)
> PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
>
> pc_i440fx_9_0_machine_options(m);
> - m->alias = NULL;
> - m->is_default = false;
>
> compat_props_add(m->compat_props, hw_compat_8_2, hw_compat_8_2_len);
> compat_props_add(m->compat_props, pc_compat_8_2, pc_compat_8_2_len);
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index c7bc8a2041f..6e1180d4b60 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -365,12 +365,23 @@ static void pc_q35_machine_options(MachineClass *m)
> pc_q35_compat_defaults, pc_q35_compat_defaults_len);
> }
>
> -static void pc_q35_9_0_machine_options(MachineClass *m)
> +static void pc_q35_9_1_machine_options(MachineClass *m)
> {
> pc_q35_machine_options(m);
> m->alias = "q35";
> }
>
> +DEFINE_Q35_MACHINE(v9_1, "pc-q35-9.1", NULL,
> + pc_q35_9_1_machine_options);
> +
> +static void pc_q35_9_0_machine_options(MachineClass *m)
> +{
> + pc_q35_9_1_machine_options(m);
> + m->alias = NULL;
> + compat_props_add(m->compat_props, hw_compat_9_0, hw_compat_9_0_len);
> + compat_props_add(m->compat_props, pc_compat_9_0, pc_compat_9_0_len);
> +}
> +
> DEFINE_Q35_MACHINE(v9_0, "pc-q35-9.0", NULL,
> pc_q35_9_0_machine_options);
>
> @@ -378,7 +389,6 @@ static void pc_q35_8_2_machine_options(MachineClass *m)
> {
> PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> pc_q35_9_0_machine_options(m);
> - m->alias = NULL;
> m->max_cpus = 1024;
> compat_props_add(m->compat_props, hw_compat_8_2, hw_compat_8_2_len);
> compat_props_add(m->compat_props, pc_compat_8_2, pc_compat_8_2_len);
> diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
> index b8e5e102e6b..09bc9bdfefb 100644
> --- a/hw/m68k/virt.c
> +++ b/hw/m68k/virt.c
> @@ -357,10 +357,17 @@ type_init(virt_machine_register_types)
> } \
> type_init(machvirt_machine_##major##_##minor##_init);
>
> -static void virt_machine_9_0_options(MachineClass *mc)
> +static void virt_machine_9_1_options(MachineClass *mc)
> {
> }
> -DEFINE_VIRT_MACHINE(9, 0, true)
> +DEFINE_VIRT_MACHINE(9, 1, true)
> +
> +static void virt_machine_9_0_options(MachineClass *mc)
> +{
> + virt_machine_9_1_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_9_0, hw_compat_9_0_len);
> +}
> +DEFINE_VIRT_MACHINE(9, 0, false)
>
> static void virt_machine_8_2_options(MachineClass *mc)
> {
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index c417f9dd523..ab0cf496d61 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4805,14 +4805,25 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
> type_init(spapr_machine_register_##suffix)
>
> /*
> - * pseries-9.0
> + * pseries-9.1
> */
> -static void spapr_machine_9_0_class_options(MachineClass *mc)
> +static void spapr_machine_9_1_class_options(MachineClass *mc)
> {
> /* Defaults for the latest behaviour inherited from the base class */
> }
>
> -DEFINE_SPAPR_MACHINE(9_0, "9.0", true);
> +DEFINE_SPAPR_MACHINE(9_1, "9.1", true);
> +
> +/*
> + * pseries-9.0
> + */
> +static void spapr_machine_9_0_class_options(MachineClass *mc)
> +{
> + spapr_machine_9_1_class_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_9_0, hw_compat_9_0_len);
> +}
> +
> +DEFINE_SPAPR_MACHINE(9_0, "9.0", false);
>
> /*
> * pseries-8.2
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index b1dcb3857f0..67e8b0b05e8 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -859,14 +859,26 @@ bool css_migration_enabled(void)
> } \
> type_init(ccw_machine_register_##suffix)
>
> +static void ccw_machine_9_1_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_9_1_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(9_0, "9.1", true);
> +
> static void ccw_machine_9_0_instance_options(MachineState *machine)
> {
> + ccw_machine_9_1_instance_options(machine);
> }
>
> static void ccw_machine_9_0_class_options(MachineClass *mc)
> {
> + ccw_machine_9_1_class_options(machine);
> + compat_props_add(mc->compat_props, hw_compat_9_0, hw_compat_9_0_len);
> }
> -DEFINE_CCW_MACHINE(9_0, "9.0", true);
> +DEFINE_CCW_MACHINE(9_0, "9.0", false);
>
> static void ccw_machine_8_2_instance_options(MachineState *machine)
> {
On 25/03/2024 15.14, Paolo Bonzini wrote:
> Add 9.1 machine types for arm/i440fx/m68k/q35/s390x/spapr.
>
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: Harsh Prateek Bora <harshpb@linux.ibm.com>
> Cc: Gavin Shan <gshan@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> include/hw/boards.h | 3 +++
> include/hw/i386/pc.h | 3 +++
> hw/arm/virt.c | 11 +++++++++--
> hw/core/machine.c | 3 +++
> hw/i386/pc.c | 3 +++
> hw/i386/pc_piix.c | 17 ++++++++++++++---
> hw/i386/pc_q35.c | 14 ++++++++++++--
> hw/m68k/virt.c | 11 +++++++++--
> hw/ppc/spapr.c | 17 ++++++++++++++---
> hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
> 10 files changed, 83 insertions(+), 13 deletions(-)
....
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index b1dcb3857f0..67e8b0b05e8 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -859,14 +859,26 @@ bool css_migration_enabled(void)
> } \
> type_init(ccw_machine_register_##suffix)
>
> +static void ccw_machine_9_1_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_9_1_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(9_0, "9.1", true);
> +
> static void ccw_machine_9_0_instance_options(MachineState *machine)
> {
> + ccw_machine_9_1_instance_options(machine);
> }
>
> static void ccw_machine_9_0_class_options(MachineClass *mc)
> {
> + ccw_machine_9_1_class_options(machine);
> + compat_props_add(mc->compat_props, hw_compat_9_0, hw_compat_9_0_len);
> }
> -DEFINE_CCW_MACHINE(9_0, "9.0", true);
> +DEFINE_CCW_MACHINE(9_0, "9.0", false);
>
> static void ccw_machine_8_2_instance_options(MachineState *machine)
> {
For s390x:
Acked-by: Thomas Huth <thuth@redhat.com>
On Mon, Mar 25 2024, Paolo Bonzini <pbonzini@redhat.com> wrote: > Add 9.1 machine types for arm/i440fx/m68k/q35/s390x/spapr. > > Cc: Cornelia Huck <cohuck@redhat.com> > Cc: Thomas Huth <thuth@redhat.com> > Cc: Harsh Prateek Bora <harshpb@linux.ibm.com> > Cc: Gavin Shan <gshan@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > include/hw/boards.h | 3 +++ > include/hw/i386/pc.h | 3 +++ > hw/arm/virt.c | 11 +++++++++-- > hw/core/machine.c | 3 +++ > hw/i386/pc.c | 3 +++ > hw/i386/pc_piix.c | 17 ++++++++++++++--- > hw/i386/pc_q35.c | 14 ++++++++++++-- > hw/m68k/virt.c | 11 +++++++++-- > hw/ppc/spapr.c | 17 ++++++++++++++--- > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- > 10 files changed, 83 insertions(+), 13 deletions(-) Reviewed-by: Cornelia Huck <cohuck@redhat.com>
© 2016 - 2026 Red Hat, Inc.