| Message ID | 20230914035117.3285885-8-xiaoyao.li@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | QEMU gmem implemention | expand |
On 14.09.23 05:51, Xiaoyao Li 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. So we'll fallback to kvm_arch_get_default_type(), which simply returns 0. > On the other hand, later patch will implement kvm_type() > method for all x86/i386 machines to support KVM_X86_SW_PROTECTED_VM. > ^ I suggest dropping that and merging that patch ahead-of-time as a simple cleanup. Reviewed-by: David Hildenbrand <david@redhat.com>
On 9/21/2023 4:51 PM, David Hildenbrand wrote: > On 14.09.23 05:51, Xiaoyao Li 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. > > So we'll fallback to kvm_arch_get_default_type(), which simply returns 0. > >> On the other hand, later patch will implement kvm_type() >> method for all x86/i386 machines to support KVM_X86_SW_PROTECTED_VM. >> > > ^ I suggest dropping that and merging that patch ahead-of-time as a > simple cleanup. I suppose the "that" here means "this patch", right? If so, I can submit this patch separately. > Reviewed-by: David Hildenbrand <david@redhat.com> >
On 22.09.23 02:24, Xiaoyao Li wrote: > On 9/21/2023 4:51 PM, David Hildenbrand wrote: >> On 14.09.23 05:51, Xiaoyao Li 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. >> >> So we'll fallback to kvm_arch_get_default_type(), which simply returns 0. >> >>> On the other hand, later patch will implement kvm_type() >>> method for all x86/i386 machines to support KVM_X86_SW_PROTECTED_VM. >>> >> >> ^ I suggest dropping that and merging that patch ahead-of-time as a >> simple cleanup. > > I suppose the "that" here means "this patch", right? With that I meant that paragraph "On the other hand, later patch ...".
On Wed, 2023-09-13 at 23:51 -0400, Xiaoyao Li 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> > Reviewed-by: Isaku Yamahata <isaku.yamahata@intel.com> Indeed, I added it and then later ripped everything out of it and left it empty, as you nicely describe (thanks) in your commit message. I have no designs on using it again, so Acked-by: David Woodhouse <dwmw@amazon.co.uk>
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> Reviewed-by: Isaku Yamahata <isaku.yamahata@intel.com> --- hw/i386/pc.c | 5 ----- include/hw/i386/pc.h | 3 --- 2 files changed, 8 deletions(-)