[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH for-6.2 v3 10/11] machine: Remove smp_parse callback from Mac
From: |
Andrew Jones |
Subject: |
Re: [PATCH for-6.2 v3 10/11] machine: Remove smp_parse callback from MachineClass |
Date: |
Wed, 28 Jul 2021 22:39:44 +0200 |
On Wed, Jul 28, 2021 at 11:48:47AM +0800, Yanan Wang wrote:
> Now we have a generic smp parser for all arches, and there will
> not be any other arch specific ones, so let's remove the callback
> from MachineClass and call the parser directly.
>
> Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
> ---
> hw/core/machine.c | 3 +--
> include/hw/boards.h | 5 -----
> 2 files changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 76b6c3bc64..8f84e38e2e 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -934,7 +934,7 @@ static void machine_set_smp(Object *obj, Visitor *v,
> const char *name,
> goto out_free;
> }
>
> - mc->smp_parse(ms, config, errp);
> + smp_parse(ms, config, errp);
> if (errp) {
> goto out_free;
> }
> @@ -963,7 +963,6 @@ static void machine_class_init(ObjectClass *oc, void
> *data)
> /* Default 128 MB as guest ram size */
> mc->default_ram_size = 128 * MiB;
> mc->rom_file_has_mr = true;
> - mc->smp_parse = smp_parse;
>
> /* numa node memory size aligned on 8MB by default.
> * On Linux, each node's border has to be 8MB aligned
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index 0631900c08..72123f594d 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -177,10 +177,6 @@ typedef struct {
> * kvm-type may be NULL if it is not needed.
> * @numa_mem_supported:
> * true if '--numa node.mem' option is supported and false otherwise
> - * @smp_parse:
> - * The function pointer to hook different machine specific functions for
> - * parsing "smp-opts" from QemuOpts to MachineState::CpuTopology and more
> - * machine specific topology fields, such as smp_dies for PCMachine.
> * @hotplug_allowed:
> * If the hook is provided, then it'll be called for each device
> * hotplug to check whether the device hotplug is allowed. Return
> @@ -217,7 +213,6 @@ struct MachineClass {
> void (*reset)(MachineState *state);
> void (*wakeup)(MachineState *state);
> int (*kvm_type)(MachineState *machine, const char *arg);
> - void (*smp_parse)(MachineState *ms, SMPConfiguration *config, Error
> **errp);
>
> BlockInterfaceType block_default_type;
> int units_per_default_bus;
> --
> 2.19.1
>
Reviewed-by: Andrew Jones <drjones@redhat.com>
- Re: [PATCH for-6.2 v3 01/11] machine: Minor refactor/cleanup for the smp parsers, (continued)
- [PATCH for-6.2 v3 08/11] machine: Tweak the order of topology members in struct CpuTopology, Yanan Wang, 2021/07/27
- [PATCH for-6.2 v3 04/11] machine: Improve the error reporting of smp parsing, Yanan Wang, 2021/07/27
- [PATCH for-6.2 v3 02/11] machine: Uniformly use maxcpus to calculate the omitted parameters, Yanan Wang, 2021/07/27
- [PATCH for-6.2 v3 07/11] machine: Use ms instead of global current_machine in sanity-check, Yanan Wang, 2021/07/27
- [PATCH for-6.2 v3 10/11] machine: Remove smp_parse callback from MachineClass, Yanan Wang, 2021/07/27
- Re: [PATCH for-6.2 v3 10/11] machine: Remove smp_parse callback from MachineClass,
Andrew Jones <=
- [PATCH for-6.2 v3 09/11] machine: Make smp_parse generic enough for all arches, Yanan Wang, 2021/07/27
- [PATCH for-6.2 v3 03/11] machine: Set the value of cpus to match maxcpus if it's omitted, Yanan Wang, 2021/07/27
- [PATCH for-6.2 v3 06/11] machine: Prefer cores over sockets in smp parsing since 6.2, Yanan Wang, 2021/07/27
- [PATCH for-6.2 v3 11/11] machine: Move smp_prefer_sockets to struct SMPCompatProps, Yanan Wang, 2021/07/27