From: Igor Mammedov <imammedo@redhat.com>
To: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Fam Zheng <fam@euphon.net>,
Peter Maydell <peter.maydell@linaro.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
qemu-devel@nongnu.org,
Raphael Norwitz <raphael.norwitz@nutanix.com>,
qemu-block@nongnu.org, David Hildenbrand <david@redhat.com>,
Halil Pasic <pasic@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Richard Henderson <rth@twiddle.net>,
lersek@redhat.com, Thomas Huth <thuth@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
qemu-s390x@nongnu.org, qemu-arm@nongnu.org,
David Gibson <david@gibson.dropbear.id.au>,
Kevin Wolf <kwolf@redhat.com>,
Pankaj Gupta <pankaj.gupta.linux@gmail.com>,
cohuck@redhat.com, Max Reitz <mreitz@redhat.com>,
qemu-ppc@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [PATCH v6 2/7] hw: add 5.2 machine types and 5.1 compat options
Date: Wed, 19 Aug 2020 15:06:07 +0200 [thread overview]
Message-ID: <20200819150607.14d46d2f@redhat.com> (raw)
In-Reply-To: <20200818143348.310613-3-stefanha@redhat.com>
On Tue, 18 Aug 2020 15:33:43 +0100
Stefan Hajnoczi <stefanha@redhat.com> wrote:
> arm, i386, ppc, and s390x have versioned machine types and associated
> compatibility options. Introduce new ones now that QEMU 5.1 has been
> released.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> include/hw/boards.h | 3 +++
> include/hw/i386/pc.h | 3 +++
> hw/arm/virt.c | 9 ++++++++-
> hw/core/machine.c | 4 ++++
> hw/i386/pc.c | 4 ++++
> hw/i386/pc_piix.c | 14 +++++++++++++-
> hw/i386/pc_q35.c | 13 ++++++++++++-
> hw/ppc/spapr.c | 15 +++++++++++++--
> hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
> 9 files changed, 73 insertions(+), 6 deletions(-)
>
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index 426ce5f625..bc5b82ad20 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -319,6 +319,9 @@ struct MachineState {
> } \
> type_init(machine_initfn##_register_types)
>
> +extern GlobalProperty hw_compat_5_1[];
> +extern const size_t hw_compat_5_1_len;
> +
> extern GlobalProperty hw_compat_5_0[];
> extern const size_t hw_compat_5_0_len;
>
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 3d7ed3a55e..fe52e165b2 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -193,6 +193,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_5_1[];
> +extern const size_t pc_compat_5_1_len;
> +
> extern GlobalProperty pc_compat_5_0[];
> extern const size_t pc_compat_5_0_len;
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index ecfee362a1..acf9bfbece 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -2546,10 +2546,17 @@ static void machvirt_machine_init(void)
> }
> type_init(machvirt_machine_init);
>
> +static void virt_machine_5_2_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE_AS_LATEST(5, 2)
> +
> static void virt_machine_5_1_options(MachineClass *mc)
> {
> + virt_machine_5_2_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len);
> }
> -DEFINE_VIRT_MACHINE_AS_LATEST(5, 1)
> +DEFINE_VIRT_MACHINE(5, 1)
>
> static void virt_machine_5_0_options(MachineClass *mc)
> {
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 8d1a90c6cf..a6f7e4e8d7 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -28,6 +28,10 @@
> #include "hw/mem/nvdimm.h"
> #include "migration/vmstate.h"
>
> +GlobalProperty hw_compat_5_1[] = {
> +};
> +const size_t hw_compat_5_1_len = G_N_ELEMENTS(hw_compat_5_1);
> +
> GlobalProperty hw_compat_5_0[] = {
> { "pci-host-bridge", "x-config-reg-migration-enabled", "off" },
> { "virtio-balloon-device", "page-poison", "false" },
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 47c5ca3e34..4afcf17f99 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -97,6 +97,10 @@
> #include "fw_cfg.h"
> #include "trace.h"
>
> +GlobalProperty pc_compat_5_1[] = {
> +};
> +const size_t pc_compat_5_1_len = G_N_ELEMENTS(pc_compat_5_1);
> +
> GlobalProperty pc_compat_5_0[] = {
> };
> const size_t pc_compat_5_0_len = G_N_ELEMENTS(pc_compat_5_0);
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index b789e83f9a..9ce1f9c5d6 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -426,7 +426,7 @@ static void pc_i440fx_machine_options(MachineClass *m)
> machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
> }
>
> -static void pc_i440fx_5_1_machine_options(MachineClass *m)
> +static void pc_i440fx_5_2_machine_options(MachineClass *m)
> {
> PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> pc_i440fx_machine_options(m);
> @@ -435,6 +435,18 @@ static void pc_i440fx_5_1_machine_options(MachineClass *m)
> pcmc->default_cpu_version = 1;
> }
>
> +DEFINE_I440FX_MACHINE(v5_2, "pc-i440fx-5.2", NULL,
> + pc_i440fx_5_2_machine_options);
> +
> +static void pc_i440fx_5_1_machine_options(MachineClass *m)
> +{
> + pc_i440fx_machine_options(m);
> + m->alias = NULL;
> + m->is_default = false;
> + compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len);
> + compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len);
> +}
> +
> DEFINE_I440FX_MACHINE(v5_1, "pc-i440fx-5.1", NULL,
> pc_i440fx_5_1_machine_options);
>
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index a3e607a544..4acaad557c 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -353,7 +353,7 @@ static void pc_q35_machine_options(MachineClass *m)
> m->max_cpus = 288;
> }
>
> -static void pc_q35_5_1_machine_options(MachineClass *m)
> +static void pc_q35_5_2_machine_options(MachineClass *m)
> {
> PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> pc_q35_machine_options(m);
> @@ -361,6 +361,17 @@ static void pc_q35_5_1_machine_options(MachineClass *m)
> pcmc->default_cpu_version = 1;
> }
>
> +DEFINE_Q35_MACHINE(v5_2, "pc-q35-5.2", NULL,
> + pc_q35_5_2_machine_options);
> +
> +static void pc_q35_5_1_machine_options(MachineClass *m)
> +{
> + pc_q35_machine_options(m);
> + m->alias = NULL;
> + compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len);
> + compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len);
> +}
> +
> DEFINE_Q35_MACHINE(v5_1, "pc-q35-5.1", NULL,
> pc_q35_5_1_machine_options);
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 0ae293ec94..1c8d0981b3 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4579,15 +4579,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
> } \
> type_init(spapr_machine_register_##suffix)
>
> +/*
> + * pseries-5.2
> + */
> +static void spapr_machine_5_2_class_options(MachineClass *mc)
> +{
> + /* Defaults for the latest behaviour inherited from the base class */
> +}
> +
> +DEFINE_SPAPR_MACHINE(5_2, "5.2", true);
> +
> /*
> * pseries-5.1
> */
> static void spapr_machine_5_1_class_options(MachineClass *mc)
> {
> - /* Defaults for the latest behaviour inherited from the base class */
> + spapr_machine_5_2_class_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len);
> }
>
> -DEFINE_SPAPR_MACHINE(5_1, "5.1", true);
> +DEFINE_SPAPR_MACHINE(5_1, "5.1", false);
>
> /*
> * pseries-5.0
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index e72c61d2ea..f4ea6a9545 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -801,14 +801,26 @@ bool css_migration_enabled(void)
> } \
> type_init(ccw_machine_register_##suffix)
>
> +static void ccw_machine_5_2_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_5_2_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(5_2, "5.2", true);
> +
> static void ccw_machine_5_1_instance_options(MachineState *machine)
> {
> + ccw_machine_5_2_instance_options(machine);
> }
>
> static void ccw_machine_5_1_class_options(MachineClass *mc)
> {
> + ccw_machine_5_2_class_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len);
> }
> -DEFINE_CCW_MACHINE(5_1, "5.1", true);
> +DEFINE_CCW_MACHINE(5_1, "5.1", false);
>
> static void ccw_machine_5_0_instance_options(MachineState *machine)
> {
i
next prev parent reply other threads:[~2020-08-19 13:06 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-18 14:33 [PATCH v6 0/7] virtio-pci: enable blk and scsi multi-queue by default Stefan Hajnoczi
2020-08-18 14:33 ` [PATCH v6 1/7] Open 5.2 development tree Stefan Hajnoczi
2020-08-19 14:13 ` Stefan Hajnoczi
2020-08-19 14:13 ` Stefan Hajnoczi
2020-08-18 14:33 ` [PATCH v6 2/7] hw: add 5.2 machine types and 5.1 compat options Stefan Hajnoczi
2020-08-18 14:33 ` Stefan Hajnoczi
2020-08-18 15:11 ` Cornelia Huck
2020-08-18 15:11 ` Cornelia Huck
2020-08-19 12:54 ` Igor Mammedov
2020-08-19 14:10 ` Cornelia Huck
2020-08-19 14:12 ` Stefan Hajnoczi
2020-08-19 14:38 ` Laszlo Ersek
2020-08-19 15:27 ` Philippe Mathieu-Daudé
2020-08-19 13:06 ` Igor Mammedov [this message]
2020-08-18 14:33 ` [PATCH v6 3/7] virtio-pci: add virtio_pci_optimal_num_queues() helper Stefan Hajnoczi
2020-08-18 14:33 ` Stefan Hajnoczi
2020-08-18 14:33 ` [PATCH v6 4/7] virtio-scsi: introduce a constant for fixed virtqueues Stefan Hajnoczi
2020-08-18 14:33 ` [PATCH v6 5/7] virtio-scsi-pci: default num_queues to -smp N Stefan Hajnoczi
2020-08-18 15:16 ` Cornelia Huck
2020-08-18 15:16 ` Cornelia Huck
2020-08-23 2:10 ` Raphael Norwitz
2020-08-18 14:33 ` [PATCH v6 6/7] virtio-blk-pci: " Stefan Hajnoczi
2020-08-18 14:33 ` [PATCH v6 7/7] vhost-user-blk-pci: " Stefan Hajnoczi
2020-08-18 14:33 ` Stefan Hajnoczi
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=20200819150607.14d46d2f@redhat.com \
--to=imammedo@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=david@redhat.com \
--cc=ehabkost@redhat.com \
--cc=fam@euphon.net \
--cc=kwolf@redhat.com \
--cc=lersek@redhat.com \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=pankaj.gupta.linux@gmail.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=raphael.norwitz@nutanix.com \
--cc=rth@twiddle.net \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.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 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.