92 lines
3.7 KiB
Diff
92 lines
3.7 KiB
Diff
|
From 03e275023b482ac79b4f92ca4ceef6de3caa634f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
Date: Thu, 9 May 2024 19:00:40 +0200
|
||
|
|
Subject: [PATCH 045/100] i386: pc: remove unnecessary MachineClass overrides
|
||
|
|
|
||
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
RH-MergeRequest: 245: SEV-SNP support
|
||
|
|
RH-Jira: RHEL-39544
|
||
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
RH-Acked-by: Bandan Das <bdas@redhat.com>
|
||
|
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||
|
|
RH-Commit: [45/91] c03d5b57014d0d02f6ce0cdfb19a34996d100dea (bonzini/rhel-qemu-kvm)
|
||
|
|
|
||
|
|
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>
|
||
|
|
(cherry picked from commit b348fdcdac9f9fc70be9ae56c54e41765e9aae24)
|
||
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
|
---
|
||
|
|
hw/i386/pc.c | 3 ---
|
||
|
|
hw/i386/x86.c | 6 +++---
|
||
|
|
include/hw/i386/x86.h | 4 ----
|
||
|
|
3 files changed, 3 insertions(+), 10 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
|
||
|
|
index 660a59c63b..0aca0cc79e 100644
|
||
|
|
--- a/hw/i386/pc.c
|
||
|
|
+++ b/hw/i386/pc.c
|
||
|
|
@@ -1979,9 +1979,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
|
||
|
|
mc->async_pf_vmexit_disable = false;
|
||
|
|
mc->get_hotplug_handler = pc_get_hotplug_handler;
|
||
|
|
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_memdev = true;
|
||
|
|
mc->has_hotpluggable_cpus = true;
|
||
|
|
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
|
||
|
|
index c61f4ebfa6..fcef652c1e 100644
|
||
|
|
--- a/hw/i386/x86.c
|
||
|
|
+++ b/hw/i386/x86.c
|
||
|
|
@@ -443,7 +443,7 @@ void x86_cpu_pre_plug(HotplugHandler *hotplug_dev,
|
||
|
|
numa_cpu_pre_plug(cpu_slot, dev, errp);
|
||
|
|
}
|
||
|
|
|
||
|
|
-CpuInstanceProperties
|
||
|
|
+static CpuInstanceProperties
|
||
|
|
x86_cpu_index_to_props(MachineState *ms, unsigned cpu_index)
|
||
|
|
{
|
||
|
|
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;
|
||
|
|
}
|
||
|
|
|
||
|
|
-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;
|
||
|
|
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;
|
||
|
|
}
|
||
|
|
|
||
|
|
-const CPUArchIdList *x86_possible_cpu_arch_ids(MachineState *ms)
|
||
|
|
+static const CPUArchIdList *x86_possible_cpu_arch_ids(MachineState *ms)
|
||
|
|
{
|
||
|
|
X86MachineState *x86ms = X86_MACHINE(ms);
|
||
|
|
unsigned int max_cpus = ms->smp.max_cpus;
|
||
|
|
diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h
|
||
|
|
index d7b7d3f3ce..c2062db13f 100644
|
||
|
|
--- a/include/hw/i386/x86.h
|
||
|
|
+++ b/include/hw/i386/x86.h
|
||
|
|
@@ -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_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);
|
||
|
|
void x86_rtc_set_cpus_count(ISADevice *rtc, uint16_t cpus_count);
|
||
|
|
void x86_cpu_pre_plug(HotplugHandler *hotplug_dev,
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|