From: "Michael S. Tsirkin" <mst@redhat.com>
To: Cornelia Huck <cohuck@redhat.com>
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Yanan Wang" <wangyanan55@huawei.com>,
"Zhao Liu" <zhao1.liu@intel.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Laurent Vivier" <laurent@vivier.eu>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Harsh Prateek Bora" <harshpb@linux.ibm.com>,
"Thomas Huth" <thuth@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Christian Borntraeger" <borntraeger@linux.ibm.com>,
"Eric Farman" <farman@linux.ibm.com>,
"David Hildenbrand" <david@redhat.com>,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
qemu-arm@nongnu.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org,
qemu-s390x@nongnu.org
Subject: Re: [PATCH] hw: add compat machines for 10.1
Date: Mon, 14 Apr 2025 07:38:43 -0400 [thread overview]
Message-ID: <20250414073837-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20250414094543.221241-1-cohuck@redhat.com>
On Mon, Apr 14, 2025 at 11:45:43AM +0200, Cornelia Huck wrote:
> Add 10.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/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 a96452f17a48..3e72adaa918f 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -3408,10 +3408,17 @@ static void machvirt_machine_init(void)
> }
> type_init(machvirt_machine_init);
>
> +static void virt_machine_10_1_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE_AS_LATEST(10, 1)
> +
> static void virt_machine_10_0_options(MachineClass *mc)
> {
> + virt_machine_10_1_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_10_0, hw_compat_10_0_len);
> }
> -DEFINE_VIRT_MACHINE_AS_LATEST(10, 0)
> +DEFINE_VIRT_MACHINE(10, 0)
>
> static void virt_machine_9_2_options(MachineClass *mc)
> {
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 63c6ef93d296..abfcedd4a5f7 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -37,6 +37,9 @@
> #include "hw/virtio/virtio-iommu.h"
> #include "audio/audio.h"
>
> +GlobalProperty hw_compat_10_0[] = {};
> +const size_t hw_compat_10_0_len = G_N_ELEMENTS(hw_compat_10_0);
> +
> GlobalProperty hw_compat_9_2[] = {
> {"arm-cpu", "backcompat-pauth-default-use-qarma5", "true"},
> { "virtio-balloon-pci", "vectors", "0" },
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 01d0581f62a3..1b5d55e96d51 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -79,6 +79,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_10_0[] = {};
> +const size_t pc_compat_10_0_len = G_N_ELEMENTS(pc_compat_10_0);
> +
> GlobalProperty pc_compat_9_2[] = {};
> const size_t pc_compat_9_2_len = G_N_ELEMENTS(pc_compat_9_2);
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 6c91e2d29298..dbb59df64f75 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -479,12 +479,21 @@ static void pc_i440fx_machine_options(MachineClass *m)
> "Use a different south bridge than PIIX3");
> }
>
> -static void pc_i440fx_machine_10_0_options(MachineClass *m)
> +static void pc_i440fx_machine_10_1_options(MachineClass *m)
> {
> pc_i440fx_machine_options(m);
> }
>
> -DEFINE_I440FX_MACHINE_AS_LATEST(10, 0);
> +DEFINE_I440FX_MACHINE_AS_LATEST(10, 1);
> +
> +static void pc_i440fx_machine_10_0_options(MachineClass *m)
> +{
> + pc_i440fx_machine_10_1_options(m);
> + compat_props_add(m->compat_props, hw_compat_10_0, hw_compat_10_0_len);
> + compat_props_add(m->compat_props, pc_compat_10_0, pc_compat_10_0_len);
> +}
> +
> +DEFINE_I440FX_MACHINE(10, 0);
>
> static void pc_i440fx_machine_9_2_options(MachineClass *m)
> {
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index fd96d0345c7d..c538b3d05b47 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -361,12 +361,21 @@ static void pc_q35_machine_options(MachineClass *m)
> pc_q35_compat_defaults, pc_q35_compat_defaults_len);
> }
>
> -static void pc_q35_machine_10_0_options(MachineClass *m)
> +static void pc_q35_machine_10_1_options(MachineClass *m)
> {
> pc_q35_machine_options(m);
> }
>
> -DEFINE_Q35_MACHINE_AS_LATEST(10, 0);
> +DEFINE_Q35_MACHINE_AS_LATEST(10, 1);
> +
> +static void pc_q35_machine_10_0_options(MachineClass *m)
> +{
> + pc_q35_machine_10_1_options(m);
> + compat_props_add(m->compat_props, hw_compat_10_0, hw_compat_10_0_len);
> + compat_props_add(m->compat_props, pc_compat_10_0, pc_compat_10_0_len);
> +}
> +
> +DEFINE_Q35_MACHINE(10, 0);
>
> static void pc_q35_machine_9_2_options(MachineClass *m)
> {
> diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
> index d967bdd7438e..295a614e1619 100644
> --- a/hw/m68k/virt.c
> +++ b/hw/m68k/virt.c
> @@ -366,10 +366,17 @@ type_init(virt_machine_register_types)
> #define DEFINE_VIRT_MACHINE(major, minor) \
> DEFINE_VIRT_MACHINE_IMPL(false, major, minor)
>
> +static void virt_machine_10_1_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE_AS_LATEST(10, 1)
> +
> static void virt_machine_10_0_options(MachineClass *mc)
> {
> + virt_machine_10_1_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_10_0, hw_compat_10_0_len);
> }
> -DEFINE_VIRT_MACHINE_AS_LATEST(10, 0)
> +DEFINE_VIRT_MACHINE(10, 0)
>
> static void virt_machine_9_2_options(MachineClass *mc)
> {
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index b0a0f8c68951..6fef1d167ae6 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4766,15 +4766,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
> #define DEFINE_SPAPR_MACHINE(major, minor) \
> DEFINE_SPAPR_MACHINE_IMPL(false, major, minor)
>
> +/*
> + * pseries-10.1
> + */
> +static void spapr_machine_10_1_class_options(MachineClass *mc)
> +{
> + /* Defaults for the latest behaviour inherited from the base class */
> +}
> +
> +DEFINE_SPAPR_MACHINE_AS_LATEST(10, 1);
> +
> /*
> * pseries-10.0
> */
> static void spapr_machine_10_0_class_options(MachineClass *mc)
> {
> - /* Defaults for the latest behaviour inherited from the base class */
> + spapr_machine_10_1_class_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_10_0, hw_compat_10_0_len);
> }
>
> -DEFINE_SPAPR_MACHINE_AS_LATEST(10, 0);
> +DEFINE_SPAPR_MACHINE(10, 0);
>
> /*
> * pseries-9.2
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index 75b32182eb01..d64923a2c86b 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -921,14 +921,26 @@ static const TypeInfo ccw_machine_info = {
> DEFINE_CCW_MACHINE_IMPL(false, major, minor)
>
>
> +static void ccw_machine_10_1_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_10_1_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE_AS_LATEST(10, 1);
> +
> static void ccw_machine_10_0_instance_options(MachineState *machine)
> {
> + ccw_machine_10_1_instance_options(machine);
> }
>
> static void ccw_machine_10_0_class_options(MachineClass *mc)
> {
> + ccw_machine_10_1_class_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_10_0, hw_compat_10_0_len);
> }
> -DEFINE_CCW_MACHINE_AS_LATEST(10, 0);
> +DEFINE_CCW_MACHINE(10, 0);
>
> static void ccw_machine_9_2_instance_options(MachineState *machine)
> {
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index f22b2e7fc75b..bfe8643a27ad 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -761,6 +761,9 @@ struct MachineState {
> } \
> type_init(machine_initfn##_register_types)
>
> +extern GlobalProperty hw_compat_10_0[];
> +extern const size_t hw_compat_10_0_len;
> +
> extern GlobalProperty hw_compat_9_2[];
> extern const size_t hw_compat_9_2_len;
>
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 103b54301f82..8677dc8950b4 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -215,6 +215,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_10_0[];
> +extern const size_t pc_compat_10_0_len;
> +
> extern GlobalProperty pc_compat_9_2[];
> extern const size_t pc_compat_9_2_len;
>
> --
> 2.49.0
next prev parent reply other threads:[~2025-04-14 11:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-14 9:45 [PATCH] hw: add compat machines for 10.1 Cornelia Huck
2025-04-14 11:38 ` Michael S. Tsirkin [this message]
2025-04-14 11:49 ` Thomas Huth
2025-04-14 14:56 ` Zhao Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250414073837-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=borntraeger@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=danielhb413@gmail.com \
--cc=david@redhat.com \
--cc=eduardo@habkost.net \
--cc=farman@linux.ibm.com \
--cc=harshpb@linux.ibm.com \
--cc=iii@linux.ibm.com \
--cc=laurent@vivier.eu \
--cc=marcel.apfelbaum@gmail.com \
--cc=npiggin@gmail.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
--cc=wangyanan55@huawei.com \
--cc=zhao1.liu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).