Re: [RFC 05/52] hw/core/machine: Rename machine-smp.c to machine-topo.c

[wangyanan (Y)]

Hi Zhao，
在 2023/2/13 17:49, Zhao Liu 写道:
> From: Zhao Liu <zhao1.liu@intel.com>
>
> Hybrid topology support will also be added to this file.
>
> In order to maintain the semantic consistency of the file name and
> content, the file name is changed to "machine-topo.c".
>
> This file will handle all cpu topology related things, thus also change
> the file description comment.
>
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
>   MAINTAINERS                               | 2 +-
>   hw/core/{machine-smp.c => machine-topo.c} | 2 +-
>   hw/core/meson.build                       | 2 +-
>   tests/unit/meson.build                    | 2 +-
>   4 files changed, 4 insertions(+), 4 deletions(-)
>   rename hw/core/{machine-smp.c => machine-topo.c} (99%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 71c1bc24371b..58794885ced3 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1733,7 +1733,7 @@ F: cpu.c
>   F: hw/core/cpu.c
>   F: hw/core/machine-qmp-cmds.c
>   F: hw/core/machine.c
> -F: hw/core/machine-smp.c
> +F: hw/core/machine-topo.c
>   F: hw/core/null-machine.c
>   F: hw/core/numa.c
>   F: hw/cpu/cluster.c
> diff --git a/hw/core/machine-smp.c b/hw/core/machine-topo.c
> similarity index 99%
> rename from hw/core/machine-smp.c
> rename to hw/core/machine-topo.c
Better named as cpu-topology.c? So that it's consistent with the
header "cpu-topology.h" in a following patch.

Thanks,
Yanan
> index 3fd9e641efde..8066d2c46bef 100644
> --- a/hw/core/machine-smp.c
> +++ b/hw/core/machine-topo.c
> @@ -1,5 +1,5 @@
>   /*
> - * QEMU Machine core (related to -smp parsing)
> + * QEMU Machine core (related to CPU topology)
>    *
>    * Copyright (c) 2021 Huawei Technologies Co., Ltd
>    *
> diff --git a/hw/core/meson.build b/hw/core/meson.build
> index 7a4d02b6c050..71d523dc6826 100644
> --- a/hw/core/meson.build
> +++ b/hw/core/meson.build
> @@ -23,7 +23,7 @@ else
>   endif
>   
>   common_ss.add(files('cpu-common.c'))
> -common_ss.add(files('machine-smp.c'))
> +common_ss.add(files('machine-topo.c'))
>   softmmu_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c'))
>   softmmu_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: 
> files('generic-loader.c'))
>   softmmu_ss.add(when: ['CONFIG_GUEST_LOADER', fdt], if_true: 
> files('guest-loader.c'))
> diff --git a/tests/unit/meson.build b/tests/unit/meson.build
> index a9df2843e92e..1720a769f1a2 100644
> --- a/tests/unit/meson.build
> +++ b/tests/unit/meson.build
> @@ -46,7 +46,7 @@ tests = {
>     'test-uuid': [],
>     'ptimer-test': ['ptimer-test-stubs.c', meson.project_source_root() / 
> 'hw/core/ptimer.c'],
>     'test-qapi-util': [],
> -  'test-smp-parse': [qom, meson.project_source_root() / 
> 'hw/core/machine-smp.c'],
> +  'test-smp-parse': [qom, meson.project_source_root() / 
> 'hw/core/machine-topo.c'],
>     'test-interval-tree': [],
>   }
>