Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-17 16:03:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

machine: Remove smp_parse callback from MachineClass

Browse Source 
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>
This commit is contained in:
Yanan Wang 2021-09-29 10:58:13 +08:00 committed by Paolo Bonzini
parent e4a97a893b
commit 7687b2b3ed
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/core/machine.c
View File

@ -918,7 +918,7 @@ static void machine_set_smp(Object *obj, Visitor *v, const char *name,
"CPU topology parameters must be greater than zero"); "CPU topology parameters must be greater than zero");
} }
mc->smp_parse(ms, config, errp); smp_parse(ms, config, errp);
if (*errp) { if (*errp) {
goto out_free; goto out_free;
} }
@ -947,7 +947,6 @@ static void machine_class_init(ObjectClass *oc, void *data)
/* Default 128 MB as guest ram size */ /* Default 128 MB as guest ram size */
mc->default_ram_size = 128 * MiB; mc->default_ram_size = 128 * MiB;
mc->rom_file_has_mr = true; mc->rom_file_has_mr = true;
mc->smp_parse = smp_parse;
/* numa node memory size aligned on 8MB by default. /* numa node memory size aligned on 8MB by default.
* On Linux, each node's border has to be 8MB aligned * On Linux, each node's border has to be 8MB aligned

5
include/hw/boards.h
View File

@ -177,10 +177,6 @@ typedef struct {
* kvm-type may be NULL if it is not needed. * kvm-type may be NULL if it is not needed.
* @numa_mem_supported: * @numa_mem_supported:
* true if '--numa node.mem' option is supported and false otherwise * 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: * @hotplug_allowed:
* If the hook is provided, then it'll be called for each device * If the hook is provided, then it'll be called for each device
* hotplug to check whether the device hotplug is allowed. Return * hotplug to check whether the device hotplug is allowed. Return
@ -217,7 +213,6 @@ struct MachineClass {
void (*reset)(MachineState *state); void (*reset)(MachineState *state);
void (*wakeup)(MachineState *state); void (*wakeup)(MachineState *state);
int (*kvm_type)(MachineState *machine, const char *arg); int (*kvm_type)(MachineState *machine, const char *arg);
void (*smp_parse)(MachineState *ms, SMPConfiguration *config, Error **errp);
BlockInterfaceType block_default_type; BlockInterfaceType block_default_type;
int units_per_default_bus; int units_per_default_bus;