motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

i386: pc: remove unnecessary MachineClass overrides

Browse source 
There is no need to override these fields of MachineClass because they are
already set to the right value in the superclass.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Message-ID: <20240509170044.190795-10-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-05-09 19:00:40 +02:00
parent 7974e51342
commit b348fdcdac
3 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hw/i386/pc.c
View file

@ -1826,9 +1826,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
assert(!mc->get_hotplug_handler); assert(!mc->get_hotplug_handler);
mc->get_hotplug_handler = pc_get_hotplug_handler; mc->get_hotplug_handler = pc_get_hotplug_handler;
mc->hotplug_allowed = pc_hotplug_allowed; mc->hotplug_allowed = pc_hotplug_allowed;
mc->cpu_index_to_instance_props = x86_cpu_index_to_props;
mc->get_default_cpu_node_id = x86_get_default_cpu_node_id;
mc->possible_cpu_arch_ids = x86_possible_cpu_arch_ids;
mc->auto_enable_numa_with_memhp = true; mc->auto_enable_numa_with_memhp = true;
mc->auto_enable_numa_with_memdev = true; mc->auto_enable_numa_with_memdev = true;
mc->has_hotpluggable_cpus = true; mc->has_hotpluggable_cpus = true;

6
hw/i386/x86.c
View file

@ -443,7 +443,7 @@ void x86_cpu_pre_plug(HotplugHandler *hotplug_dev,
numa_cpu_pre_plug(cpu_slot, dev, errp); numa_cpu_pre_plug(cpu_slot, dev, errp);
} }
CpuInstanceProperties static CpuInstanceProperties
x86_cpu_index_to_props(MachineState *ms, unsigned cpu_index) x86_cpu_index_to_props(MachineState *ms, unsigned cpu_index)
{ {
MachineClass *mc = MACHINE_GET_CLASS(ms); MachineClass *mc = MACHINE_GET_CLASS(ms);
@ -453,7 +453,7 @@ x86_cpu_index_to_props(MachineState *ms, unsigned cpu_index)
return possible_cpus->cpus[cpu_index].props; return possible_cpus->cpus[cpu_index].props;
} }
int64_t x86_get_default_cpu_node_id(const MachineState *ms, int idx) static int64_t x86_get_default_cpu_node_id(const MachineState *ms, int idx)
{ {
X86CPUTopoIDs topo_ids; X86CPUTopoIDs topo_ids;
X86MachineState *x86ms = X86_MACHINE(ms); X86MachineState *x86ms = X86_MACHINE(ms);
@ -467,7 +467,7 @@ int64_t x86_get_default_cpu_node_id(const MachineState *ms, int idx)
return topo_ids.pkg_id % ms->numa_state->num_nodes; return topo_ids.pkg_id % ms->numa_state->num_nodes;
} }
const CPUArchIdList *x86_possible_cpu_arch_ids(MachineState *ms) static const CPUArchIdList *x86_possible_cpu_arch_ids(MachineState *ms)
{ {
X86MachineState *x86ms = X86_MACHINE(ms); X86MachineState *x86ms = X86_MACHINE(ms);
unsigned int max_cpus = ms->smp.max_cpus; unsigned int max_cpus = ms->smp.max_cpus;

4
include/hw/i386/x86.h
View file

@ -114,10 +114,6 @@ uint32_t x86_cpu_apic_id_from_index(X86MachineState *pcms,
void x86_cpu_new(X86MachineState *pcms, int64_t apic_id, Error **errp); void x86_cpu_new(X86MachineState *pcms, int64_t apic_id, Error **errp);
void x86_cpus_init(X86MachineState *pcms, int default_cpu_version); void x86_cpus_init(X86MachineState *pcms, int default_cpu_version);
CpuInstanceProperties x86_cpu_index_to_props(MachineState *ms,
unsigned cpu_index);
int64_t x86_get_default_cpu_node_id(const MachineState *ms, int idx);
const CPUArchIdList *x86_possible_cpu_arch_ids(MachineState *ms);
CPUArchId *x86_find_cpu_slot(MachineState *ms, uint32_t id, int *idx); CPUArchId *x86_find_cpu_slot(MachineState *ms, uint32_t id, int *idx);
void x86_rtc_set_cpus_count(ISADevice *rtc, uint16_t cpus_count); void x86_rtc_set_cpus_count(ISADevice *rtc, uint16_t cpus_count);
void x86_cpu_pre_plug(HotplugHandler *hotplug_dev, void x86_cpu_pre_plug(HotplugHandler *hotplug_dev,