[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 10/14] machine: Remove smp_parse callback from MachineClass
From: |
Yanan Wang |
Subject: |
[PATCH v8 10/14] machine: Remove smp_parse callback from MachineClass |
Date: |
Thu, 2 Sep 2021 19:03:26 +0800 |
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>
Reviewed-by: Andrew Jones <drjones@redhat.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 4b5c943f8e..ca7ca68ae3 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -937,7 +937,7 @@ static void machine_set_smp(Object *obj, Visitor *v, const
char *name,
"CPU topology parameters must be greater than zero");
}
- mc->smp_parse(ms, config, errp);
+ smp_parse(ms, config, errp);
if (*errp) {
goto out_free;
}
@@ -966,7 +966,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 72a23e4e0f..fa284e01e9 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
- [PATCH v8 01/14] machine: Deprecate "parameter=0" SMP configurations, (continued)
- [PATCH v8 01/14] machine: Deprecate "parameter=0" SMP configurations, Yanan Wang, 2021/09/02
- [PATCH v8 06/14] machine: Prefer cores over sockets in smp parsing since 6.2, Yanan Wang, 2021/09/02
- [PATCH v8 05/14] machine: Improve the error reporting of smp parsing, Yanan Wang, 2021/09/02
- [PATCH v8 08/14] machine: Tweak the order of topology members in struct CpuTopology, Yanan Wang, 2021/09/02
- [PATCH v8 02/14] machine: Minor refactor/fix for the smp parsers, Yanan Wang, 2021/09/02
- [PATCH v8 03/14] machine: Uniformly use maxcpus to calculate the omitted parameters, Yanan Wang, 2021/09/02
- [PATCH v8 11/14] machine: Move smp_prefer_sockets to struct SMPCompatProps, Yanan Wang, 2021/09/02
- [PATCH v8 12/14] machine: Put all sanity-check in the generic SMP parser, Yanan Wang, 2021/09/02
- [PATCH v8 07/14] machine: Use ms instead of global current_machine in sanity-check, Yanan Wang, 2021/09/02
- [PATCH v8 14/14] tests/unit: Add a unit test for smp parsing, Yanan Wang, 2021/09/02
- [PATCH v8 10/14] machine: Remove smp_parse callback from MachineClass,
Yanan Wang <=
- [PATCH v8 04/14] machine: Set the value of cpus to match maxcpus if it's omitted, Yanan Wang, 2021/09/02
- [PATCH v8 09/14] machine: Make smp_parse generic enough for all arches, Yanan Wang, 2021/09/02
- [PATCH v8 13/14] machine: Split out the smp parsing code, Yanan Wang, 2021/09/02