From: Andrew Jones <drjones@redhat.com>
To: Yanan Wang <wangyanan55@huawei.com>
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
wanghaibin.wang@huawei.com,
"Richard Henderson" <richard.henderson@linaro.org>,
qemu-devel@nongnu.org, "Greg Kurz" <groug@kaod.org>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Igor Mammedov" <imammedo@redhat.com>,
yuzenghui@huawei.com, "Paolo Bonzini" <pbonzini@redhat.com>,
"David Gibson" <david@gibson.dropbear.id.au>
Subject: Re: [PATCH for-6.2 v2 06/11] hw: Add compat machines for 6.2
Date: Mon, 19 Jul 2021 19:00:13 +0200 [thread overview]
Message-ID: <20210719170013.jtnu6seyoz65g3yi@gator> (raw)
In-Reply-To: <20210719032043.25416-7-wangyanan55@huawei.com>
On Mon, Jul 19, 2021 at 11:20:38AM +0800, Yanan Wang wrote:
> Add 6.2 machine types for arm/i440fx/q35/s390x/spapr.
>
> Signed-off-by: Yanan Wang <wangyanan55@huawei.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/ppc/spapr.c | 15 +++++++++++++--
> hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
> include/hw/boards.h | 3 +++
> include/hw/i386/pc.h | 3 +++
> 9 files changed, 71 insertions(+), 6 deletions(-)
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 81eda46b0b..01165f7f53 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -2788,10 +2788,17 @@ static void machvirt_machine_init(void)
> }
> type_init(machvirt_machine_init);
>
> +static void virt_machine_6_2_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE_AS_LATEST(6, 2)
> +
> static void virt_machine_6_1_options(MachineClass *mc)
> {
> + virt_machine_6_2_options(mc);
> + compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len);
> }
> -DEFINE_VIRT_MACHINE_AS_LATEST(6, 1)
> +DEFINE_VIRT_MACHINE(6, 1)
>
> static void virt_machine_6_0_options(MachineClass *mc)
> {
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 8b4d07d3fc..63439c4a6d 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -37,6 +37,9 @@
> #include "hw/virtio/virtio.h"
> #include "hw/virtio/virtio-pci.h"
>
> +GlobalProperty hw_compat_6_1[] = {};
> +const size_t hw_compat_6_1_len = G_N_ELEMENTS(hw_compat_6_1);
> +
> GlobalProperty hw_compat_6_0[] = {
> { "gpex-pcihost", "allow-unmapped-accesses", "false" },
> { "i8042", "extended-state", "false"},
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index b6161cee88..2832f0f8aa 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -354,6 +354,9 @@ struct MachineState {
> } \
> type_init(machine_initfn##_register_types)
>
> +extern GlobalProperty hw_compat_6_1[];
> +extern const size_t hw_compat_6_1_len;
> +
> extern GlobalProperty hw_compat_6_0[];
> extern const size_t hw_compat_6_0_len;
>
Arm and general parts look good to me
Reviewed-by: Andrew Jones <drjones@redhat.com>
next prev parent reply other threads:[~2021-07-19 17:02 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-19 3:20 [PATCH for-6.2 v2 00/11] machine: smp parsing fixes and improvement Yanan Wang
2021-07-19 3:20 ` [PATCH for-6.2 v2 01/11] machine: Disallow specifying topology parameters as zero Yanan Wang
2021-07-19 16:11 ` Andrew Jones
2021-07-21 12:34 ` wangyanan (Y)
2021-07-19 16:46 ` Daniel P. Berrangé
2021-07-21 12:35 ` wangyanan (Y)
2021-07-19 3:20 ` [PATCH for-6.2 v2 02/11] machine: Make smp_parse generic enough for all arches Yanan Wang
2021-07-19 16:28 ` Andrew Jones
2021-07-19 16:36 ` Daniel P. Berrangé
2021-07-19 16:48 ` Andrew Jones
2021-07-19 16:50 ` Daniel P. Berrangé
2021-07-19 16:53 ` Daniel P. Berrangé
2021-07-22 7:18 ` wangyanan (Y)
2021-07-20 6:57 ` Cornelia Huck
2021-07-22 7:12 ` wangyanan (Y)
2021-07-19 3:20 ` [PATCH for-6.2 v2 03/11] machine: Uniformly use maxcpus to calculate the omitted parameters Yanan Wang
2021-07-19 16:36 ` Andrew Jones
2021-07-22 3:00 ` wangyanan (Y)
2021-07-19 3:20 ` [PATCH for-6.2 v2 04/11] machine: Use the computed parameters to calculate omitted cpus Yanan Wang
2021-07-19 16:42 ` Andrew Jones
2021-07-22 4:42 ` wangyanan (Y)
2021-07-22 12:27 ` Andrew Jones
2021-07-22 14:59 ` wangyanan (Y)
2021-07-22 15:05 ` Andrew Jones
2021-07-22 15:45 ` wangyanan (Y)
2021-07-19 3:20 ` [PATCH for-6.2 v2 05/11] machine: Improve the error reporting of smp parsing Yanan Wang
2021-07-19 16:53 ` Andrew Jones
2021-07-22 8:10 ` wangyanan (Y)
2021-07-22 12:47 ` Andrew Jones
2021-07-19 3:20 ` [PATCH for-6.2 v2 06/11] hw: Add compat machines for 6.2 Yanan Wang
2021-07-19 3:38 ` David Gibson
2021-07-19 17:00 ` Andrew Jones [this message]
2021-07-19 17:03 ` Cornelia Huck
2021-07-19 23:45 ` Pankaj Gupta
2021-07-19 3:20 ` [PATCH for-6.2 v2 07/11] machine: Prefer cores over sockets in smp parsing since 6.2 Yanan Wang
2021-07-19 3:40 ` David Gibson
2021-07-22 5:22 ` wangyanan (Y)
2021-07-19 17:13 ` Andrew Jones
2021-07-22 5:32 ` wangyanan (Y)
2021-07-19 3:20 ` [PATCH for-6.2 v2 08/11] machine: Use ms instead of global current_machine in sanity-check Yanan Wang
2021-07-19 17:14 ` Andrew Jones
2021-07-19 3:20 ` [PATCH for-6.2 v2 09/11] machine: Tweak the order of topology members in struct CpuTopology Yanan Wang
2021-07-19 3:20 ` [PATCH for-6.2 v2 10/11] machine: Split out the smp parsing code Yanan Wang
2021-07-19 17:20 ` Andrew Jones
2021-07-22 6:24 ` wangyanan (Y)
2021-07-22 13:07 ` Andrew Jones
2021-07-22 14:29 ` wangyanan (Y)
2021-07-19 3:20 ` [PATCH for-6.2 v2 11/11] tests/unit: Add a unit test for smp parsing Yanan Wang
2021-07-19 18:57 ` Andrew Jones
2021-07-22 6:15 ` wangyanan (Y)
2021-07-22 13:12 ` Andrew Jones
2021-07-22 14:18 ` wangyanan (Y)
2021-07-19 16:57 ` [PATCH for-6.2 v2 00/11] machine: smp parsing fixes and improvement Cornelia Huck
2021-07-21 12:38 ` wangyanan (Y)
2021-07-21 13:52 ` Pankaj Gupta
2021-07-22 2:22 ` wangyanan (Y)
2021-07-22 7:51 ` Pierre Morel
2021-07-22 8:32 ` wangyanan (Y)
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=20210719170013.jtnu6seyoz65g3yi@gator \
--to=drjones@redhat.com \
--cc=berrange@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=ehabkost@redhat.com \
--cc=groug@kaod.org \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
--cc=wanghaibin.wang@huawei.com \
--cc=wangyanan55@huawei.com \
--cc=yuzenghui@huawei.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).