| Message ID | 20230731162201.271114-7-xiaoyao.li@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | QEMU gmem implemention | expand |
On Mon, Jul 31, 2023 at 12:21:48PM -0400, Xiaoyao Li <xiaoyao.li@intel.com> wrote: > 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. On the other hand, later patch will implement kvm_type() > method for all x86/i386 machines to support KVM_X86_SW_PROTECTED_VM. > > Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> > --- > hw/i386/pc.c | 5 ----- > include/hw/i386/pc.h | 3 --- > 2 files changed, 8 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 3109d5e0e035..abeadd903827 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1794,11 +1794,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; > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index d54e8b1101e4..c98d628a76f3 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -296,15 +296,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, \ > -- > 2.34.1 > It seems strange for MachineClass to have kvm_type(). Probably AccelClass. (struct KVMAccelClass?) Anyway this is independent clean up. Reviewed-by: Isaku Yamahata <isaku.yamahata@intel.com>
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 3109d5e0e035..abeadd903827 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1794,11 +1794,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; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index d54e8b1101e4..c98d628a76f3 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -296,15 +296,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, \
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. On the other hand, later patch will implement kvm_type() method for all x86/i386 machines to support KVM_X86_SW_PROTECTED_VM. Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com> --- hw/i386/pc.c | 5 ----- include/hw/i386/pc.h | 3 --- 2 files changed, 8 deletions(-)