aboutsummaryrefslogtreecommitdiff
path: root/hw/core
diff options
context:
space:
mode:
authorYanan Wang <wangyanan55@huawei.com>2021-09-29 10:58:13 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2021-10-01 15:28:19 +0200
commit7687b2b3edc3f29ad58e8d6593d5c10dde406c34 (patch)
treecdbb082ae39cfa372366a2ca430d9f9e686c3769 /hw/core
parente4a97a893bcd7511aba812969d1fa6fe42dc1931 (diff)
machine: Remove smp_parse callback from MachineClass
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> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Message-Id: <20210929025816.21076-14-wangyanan55@huawei.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/core')
-rw-r--r--hw/core/machine.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 12872d7715..8b0f1aed83 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -918,7 +918,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;
}
@@ -947,7 +947,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