From: Xiaoyao Li <xiaoyao...@intel.com>
pc_machine_kvm_type() was introduced by commit e21be724eaf5 ("i386/xen:
add pc_machine_kvm_type to initialize XEN_EMULATE mode") to do Xen
specific initialization by utilizing kvm_type method.
commit eeedfe6c6316 ("hw/xen: Simplify emulated Xen platform init")
moves the Xen specific initialization to pc_basic_device_init().
There is no need to keep the PC specific kvm_type() implementation
anymore. So we'll fallback to kvm_arch_get_default_type(), which
simply returns 0.
Signed-off-by: Xiaoyao Li <xiaoyao...@intel.com>
Reviewed-by: Isaku Yamahata <isaku.yamah...@intel.com>
Reviewed-by: David Hildenbrand <da...@redhat.com>
Acked-by: David Woodhouse <d...@amazon.co.uk>
Acked-by: Michael S. Tsirkin <m...@redhat.com>
Message-ID: <20231007065819.27498-1-xiaoyao...@intel.com>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
include/hw/i386/pc.h | 3 ---
hw/i386/pc.c | 5 -----
2 files changed, 8 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index ec0e5efcb28..02a0deedd3c 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -310,15 +310,12 @@ extern const size_t pc_compat_1_5_len;
extern GlobalProperty pc_compat_1_4[];
extern const size_t pc_compat_1_4_len;
-int pc_machine_kvm_type(MachineState *machine, const char *vm_type);
-
#define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \
static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \
{ \
MachineClass *mc = MACHINE_CLASS(oc); \
optsfn(mc); \
mc->init = initfn; \
- mc->kvm_type = pc_machine_kvm_type; \
} \
static const TypeInfo pc_machine_type_##suffix = { \
.name = namestr TYPE_MACHINE_SUFFIX, \
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 196827531a5..28194014f82 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1756,11 +1756,6 @@ static void pc_machine_initfn(Object *obj)
cxl_machine_init(obj, &pcms->cxl_devices_state);
}
-int pc_machine_kvm_type(MachineState *machine, const char *kvm_type)
-{
- return 0;
-}
-
static void pc_machine_reset(MachineState *machine, ShutdownCause reason)
{
CPUState *cs;
--
2.43.0
