[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH for-6.2 v2 06/11] hw: Add compat machines for 6.2
From: |
Andrew Jones |
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 |
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>
- Re: [PATCH for-6.2 v2 01/11] machine: Disallow specifying topology parameters as zero, (continued)
- [PATCH for-6.2 v2 03/11] machine: Uniformly use maxcpus to calculate the omitted parameters, Yanan Wang, 2021/07/18
- [PATCH for-6.2 v2 09/11] machine: Tweak the order of topology members in struct CpuTopology, Yanan Wang, 2021/07/18
- [PATCH for-6.2 v2 06/11] hw: Add compat machines for 6.2, Yanan Wang, 2021/07/18
- [PATCH for-6.2 v2 04/11] machine: Use the computed parameters to calculate omitted cpus, Yanan Wang, 2021/07/18
- Re: [PATCH for-6.2 v2 04/11] machine: Use the computed parameters to calculate omitted cpus, Andrew Jones, 2021/07/19
- Re: [PATCH for-6.2 v2 04/11] machine: Use the computed parameters to calculate omitted cpus, wangyanan (Y), 2021/07/22
- Re: [PATCH for-6.2 v2 04/11] machine: Use the computed parameters to calculate omitted cpus, Andrew Jones, 2021/07/22
- Re: [PATCH for-6.2 v2 04/11] machine: Use the computed parameters to calculate omitted cpus, wangyanan (Y), 2021/07/22
- Re: [PATCH for-6.2 v2 04/11] machine: Use the computed parameters to calculate omitted cpus, Andrew Jones, 2021/07/22
- Re: [PATCH for-6.2 v2 04/11] machine: Use the computed parameters to calculate omitted cpus, wangyanan (Y), 2021/07/22
[PATCH for-6.2 v2 07/11] machine: Prefer cores over sockets in smp parsing since 6.2, Yanan Wang, 2021/07/18