On 08/07/2018 11:21 AM, Juergen Gross wrote: > On 07/08/18 16:00, Boris Ostrovsky wrote: >> On 08/07/2018 09:10 AM, Juergen Gross wrote: >>> On 17/07/18 14:01, Juergen Gross wrote: >>>> Some Xen related cleanups: >>>> - move some pv-only code from CONFIG_XEN to CONFIG_XEN_PV >>>> - use CONFIG_XEN_PVHVM in Makefile instead of #ifdef around a complete >>>> source >>>> - add SPDX identifier where missing >>>> >>>> Juergen Gross (4): >>>> xen: move pv irq related functions under CONFIG_XEN_PV umbrella >>>> xen: move pv specific parts of arch/x86/xen/mmu.c to mmu_pv.c >>>> xen: link platform-pci-unplug.o only if CONFIG_XEN_PVHVM >>>> xen: add SPDX identifier in arch/x86/xen files >>>> >>>> arch/x86/entry/entry_32.S | 8 +- >>>> arch/x86/entry/entry_64.S | 8 +- >>>> arch/x86/xen/Makefile | 41 ++++++-- >>>> arch/x86/xen/efi.c | 14 +-- >>>> arch/x86/xen/enlighten.c | 2 + >>>> arch/x86/xen/enlighten_hvm.c | 2 + >>>> arch/x86/xen/grant-table.c | 25 +---- >>>> arch/x86/xen/mmu.c | 188 >>>> +------------------------------------ >>>> arch/x86/xen/mmu_pv.c | 140 +++++++++++++++++++++++++++ >>>> arch/x86/xen/p2m.c | 2 + >>>> arch/x86/xen/pci-swiotlb-xen.c | 2 + >>>> arch/x86/xen/platform-pci-unplug.c | 18 +--- >>>> arch/x86/xen/vdso.h | 2 + >>>> arch/x86/xen/xen-pvh.S | 15 +-- >>>> include/xen/interface/memory.h | 6 -- >>>> include/xen/xen-ops.h | 133 +++++++++++++++++--------- >>>> 16 files changed, 287 insertions(+), 319 deletions(-) >>>> >>> Boris, any objections? >> >> This series had my R-b, but I was waiting for x86 maintainers to ack the >> first patch. >> >> But now that I looked at this again, I wonder whether >> >> +#ifdef CONFIG_XEN >> BUILD_INTERRUPT3(xen_hvm_callback_vector, HYPERVISOR_CALLBACK_VECTOR, >> xen_evtchn_do_upcall) >> +#endif >> >> >> and >> >> +#ifdef CONFIG_XEN >> apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \ >> xen_hvm_callback_vector xen_evtchn_do_upcall >> +#endif >> >> >> should be under XEN_PVHVM > Hmm, right. Do you want to change that while committing or should I send > V2?
This still needs an ack from x86 folks. And include/xen/events.h may need some additional ifdefery for xen_hvm_callback_vector(). So a v2 (for this patch only) would be good. -boris _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
