On Wed, Jul 28, 2021 at 11:48:48AM +0800, Yanan Wang wrote:
> Now we have a common structure SMPCompatProps used to store information
> about SMP compatibility stuff, so we can also move smp_prefer_sockets
> there for cleaner code.
>
> No functional change intended.
>
> Signed-off-by: Yanan Wang <wangyana...@huawei.com>
> ---
> hw/arm/virt.c | 2 +-
> hw/core/machine.c | 2 +-
> hw/i386/pc_piix.c | 2 +-
> hw/i386/pc_q35.c | 2 +-
> hw/ppc/spapr.c | 2 +-
> hw/s390x/s390-virtio-ccw.c | 2 +-
> include/hw/boards.h | 3 ++-
> 7 files changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 7babea40dc..ae029680da 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -2797,7 +2797,7 @@ 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);
> - mc->smp_prefer_sockets = true;
> + mc->smp_props.prefer_sockets = true;
> }
> DEFINE_VIRT_MACHINE(6, 1)
>
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 8f84e38e2e..61d1f643f4 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -834,7 +834,7 @@ static void smp_parse(MachineState *ms, SMPConfiguration
> *config, Error **errp)
> } else {
> maxcpus = maxcpus > 0 ? maxcpus : cpus;
>
> - if (mc->smp_prefer_sockets) {
> + if (mc->smp_props.prefer_sockets) {
> /* prefer sockets over cores over threads before 6.2 */
> if (sockets == 0) {
> cores = cores > 0 ? cores : 1;
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 9b811fc6ca..a60ebfc2c1 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -432,7 +432,7 @@ static void pc_i440fx_6_1_machine_options(MachineClass *m)
> m->is_default = false;
> compat_props_add(m->compat_props, hw_compat_6_1, hw_compat_6_1_len);
> compat_props_add(m->compat_props, pc_compat_6_1, pc_compat_6_1_len);
> - m->smp_prefer_sockets = true;
> + m->smp_props.prefer_sockets = true;
> }
>
> DEFINE_I440FX_MACHINE(v6_1, "pc-i440fx-6.1", NULL,
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 88efb7fde4..4b622ffb82 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -372,7 +372,7 @@ static void pc_q35_6_1_machine_options(MachineClass *m)
> m->alias = NULL;
> compat_props_add(m->compat_props, hw_compat_6_1, hw_compat_6_1_len);
> compat_props_add(m->compat_props, pc_compat_6_1, pc_compat_6_1_len);
> - m->smp_prefer_sockets = true;
> + m->smp_props.prefer_sockets = true;
> }
>
> DEFINE_Q35_MACHINE(v6_1, "pc-q35-6.1", NULL,
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index a481fade51..efdea43c0d 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4702,7 +4702,7 @@ static void
> spapr_machine_6_1_class_options(MachineClass *mc)
> {
> spapr_machine_6_2_class_options(mc);
> compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len);
> - mc->smp_prefer_sockets = true;
> + mc->smp_props.prefer_sockets = true;
> }
>
> DEFINE_SPAPR_MACHINE(6_1, "6.1", false);
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index b40e647883..5bdef9b4d7 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -809,7 +809,7 @@ static void ccw_machine_6_1_class_options(MachineClass
> *mc)
> {
> ccw_machine_6_2_class_options(mc);
> compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len);
> - mc->smp_prefer_sockets = true;
> + mc->smp_props.prefer_sockets = true;
> }
> DEFINE_CCW_MACHINE(6_1, "6.1", false);
>
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index 72123f594d..23671a0f8f 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -110,9 +110,11 @@ typedef struct {
>
> /**
> * SMPCompatProps:
> + * @prefer_sockets - whether sockets is preferred over cores in smp parsing
> * @dies_supported - whether dies is supported by the machine
> */
> typedef struct {
> + bool prefer_sockets;
> bool dies_supported;
> } SMPCompatProps;
>
> @@ -250,7 +252,6 @@ struct MachineClass {
> bool nvdimm_supported;
> bool numa_mem_supported;
> bool auto_enable_numa;
> - bool smp_prefer_sockets;
> SMPCompatProps smp_props;
> const char *default_ram_id;
>
> --
> 2.19.1
>
Reviewed-by: Andrew Jones <drjo...@redhat.com>
