xen: various cleanups
Subsystems (4)
Juergen Gross
maintainercover xen: various cleanups
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(-)
Signature · 1 line
2.13.7
Juergen Gross
maintainerPATCH 1/4 xen: move pv irq related functions under CONFIG_XEN_PV umbrella
All functions in arch/x86/xen/irq.c and arch/x86/xen/xen-asm*.S are specific to PV guests. Include them in the kernel with CONFIG_XEN_PV only.
Make the PV specific code in arch/x86/entry/entry_*.S dependent on CONFIG_XEN_PV instead of CONFIG_XEN.
While at it reformat the Makefile to make it more readable.
--- arch/x86/entry/entry_32.S | 8 +++++--- arch/x86/entry/entry_64.S | 8 +++++--- arch/x86/xen/Makefile | 41 +++++++++++++++++++++++++++++++---------- 3 files changed, 41 insertions(+), 16 deletions(-)
arch/x86/entry/entry_32.S +5 -3
@@ -369,7 +369,7 @@ GLOBAL(__begin_SYSENTER_singlestep_region) * will ignore all of the single-step traps generated in this range. */ -#ifdef CONFIG_XEN +#ifdef CONFIG_XEN_PV /* * Xen doesn't set %esp to be precisely what the normal SYSENTER * entry point expects, so fix it up before using the normal path.
@@ -807,7 +807,7 @@ ENTRY(spurious_interrupt_bug) jmp common_exception END(spurious_interrupt_bug) -#ifdef CONFIG_XEN +#ifdef CONFIG_XEN_PV ENTRY(xen_hypervisor_callback) pushl $-1 /* orig_ax = -1 => not a system call */ SAVE_ALL
@@ -888,11 +888,13 @@ ENTRY(xen_failsafe_callback) _ASM_EXTABLE(3b, 8b) _ASM_EXTABLE(4b, 9b) ENDPROC(xen_failsafe_callback) +#endif /* CONFIG_XEN_PV */ +#ifdef CONFIG_XEN BUILD_INTERRUPT3(xen_hvm_callback_vector, HYPERVISOR_CALLBACK_VECTOR, xen_evtchn_do_upcall) +#endif -#endif /* CONFIG_XEN */ #if IS_ENABLED(CONFIG_HYPERV)
arch/x86/entry/entry_64.S +5 -3
@@ -1049,7 +1049,7 @@ ENTRY(do_softirq_own_stack) ret ENDPROC(do_softirq_own_stack) -#ifdef CONFIG_XEN +#ifdef CONFIG_XEN_PV idtentry hypervisor_callback xen_do_hypervisor_callback has_error_code=0 /*
@@ -1129,11 +1129,13 @@ ENTRY(xen_failsafe_callback) ENCODE_FRAME_POINTER jmp error_exit END(xen_failsafe_callback) +#endif /* CONFIG_XEN_PV */ +#ifdef CONFIG_XEN apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \ xen_hvm_callback_vector xen_evtchn_do_upcall +#endif -#endif /* CONFIG_XEN */ #if IS_ENABLED(CONFIG_HYPERV) apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
@@ -1150,7 +1152,7 @@ idtentry debug do_debug has_error_code=0 paranoid=1 shift_ist=DEBUG_STACK idtentry int3 do_int3 has_error_code=0 idtentry stack_segment do_stack_segment has_error_code=1 -#ifdef CONFIG_XEN +#ifdef CONFIG_XEN_PV idtentry xennmi do_nmi has_error_code=0 idtentry xendebug do_debug has_error_code=0 idtentry xenint3 do_int3 has_error_code=0
arch/x86/xen/Makefile +31 -10
56 lines not on this page · raw message
Signature · 7 lines
2.13.7 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Juergen Gross
maintainerPATCH 1/4 xen: move pv irq related functions under CONFIG_XEN_PV umbrella
In reply to Juergen GrossAll functions in arch/x86/xen/irq.c and arch/x86/xen/xen-asm*.S are specific to PV guests. Include them in the kernel with CONFIG_XEN_PV only.
Make the PV specific code in arch/x86/entry/entry_*.S dependent on CONFIG_XEN_PV instead of CONFIG_XEN.
While at it reformat the Makefile to make it more readable.
--- arch/x86/entry/entry_32.S | 8 +++++--- arch/x86/entry/entry_64.S | 8 +++++--- arch/x86/xen/Makefile | 41 +++++++++++++++++++++++++++++++---------- 3 files changed, 41 insertions(+), 16 deletions(-)
arch/x86/entry/entry_32.S +5 -3
@@ -369,7 +369,7 @@ GLOBAL(__begin_SYSENTER_singlestep_region) * will ignore all of the single-step traps generated in this range. */ -#ifdef CONFIG_XEN +#ifdef CONFIG_XEN_PV /* * Xen doesn't set %esp to be precisely what the normal SYSENTER * entry point expects, so fix it up before using the normal path.
@@ -807,7 +807,7 @@ ENTRY(spurious_interrupt_bug) jmp common_exception END(spurious_interrupt_bug) -#ifdef CONFIG_XEN +#ifdef CONFIG_XEN_PV ENTRY(xen_hypervisor_callback) pushl $-1 /* orig_ax = -1 => not a system call */ SAVE_ALL
@@ -888,11 +888,13 @@ ENTRY(xen_failsafe_callback) _ASM_EXTABLE(3b, 8b) _ASM_EXTABLE(4b, 9b) ENDPROC(xen_failsafe_callback) +#endif /* CONFIG_XEN_PV */ +#ifdef CONFIG_XEN BUILD_INTERRUPT3(xen_hvm_callback_vector, HYPERVISOR_CALLBACK_VECTOR, xen_evtchn_do_upcall) +#endif -#endif /* CONFIG_XEN */ #if IS_ENABLED(CONFIG_HYPERV)
arch/x86/entry/entry_64.S +5 -3
@@ -1049,7 +1049,7 @@ ENTRY(do_softirq_own_stack) ret ENDPROC(do_softirq_own_stack) -#ifdef CONFIG_XEN +#ifdef CONFIG_XEN_PV idtentry hypervisor_callback xen_do_hypervisor_callback has_error_code=0 /*
@@ -1129,11 +1129,13 @@ ENTRY(xen_failsafe_callback) ENCODE_FRAME_POINTER jmp error_exit END(xen_failsafe_callback) +#endif /* CONFIG_XEN_PV */ +#ifdef CONFIG_XEN apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \ xen_hvm_callback_vector xen_evtchn_do_upcall +#endif -#endif /* CONFIG_XEN */ #if IS_ENABLED(CONFIG_HYPERV) apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
@@ -1150,7 +1152,7 @@ idtentry debug do_debug has_error_code=0 paranoid=1 shift_ist=DEBUG_STACK idtentry int3 do_int3 has_error_code=0 idtentry stack_segment do_stack_segment has_error_code=1 -#ifdef CONFIG_XEN +#ifdef CONFIG_XEN_PV idtentry xennmi do_nmi has_error_code=0 idtentry xendebug do_debug has_error_code=0 idtentry xenint3 do_int3 has_error_code=0
arch/x86/xen/Makefile +31 -10
56 lines not on this page · raw message
Signature · 1 line
2.13.7
Re: [PATCH 1/4] xen: move pv irq related functions under CONFIG_XEN_PV umbrella
arch/x86/xen/Makefile endif · line 17
Quoted 11 lines · Juergen Gross
arch/x86/xen/Makefile +0
-0@@ -12,25 +12,46 @@ endif obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_XEN_PV_SMP) += smp_pv.o obj-$(CONFIG_XEN_PVHVM_SMP) += smp_hvm.o
Is there a reason you did not add space here but did add them below?
arch/x86/xen/Makefile endif · line 36
Quoted 11 lines
arch/x86/xen/Makefile +5
-1+ obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o + obj-$(CONFIG_XEN_DEBUG_FS) += debugfs.o + obj-$(CONFIG_XEN_DOM0) += vga.o + obj-$(CONFIG_SWIOTLB_XEN) += pci-swiotlb-xen.o + obj-$(CONFIG_XEN_EFI) += efi.o -obj-$(CONFIG_XEN_PVH) += xen-pvh.o
For the series:
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [PATCH 1/4] xen: move pv irq related functions under CONFIG_XEN_PV umbrella
In reply to Juergen Grossarch/x86/xen/Makefile endif · line 17
Quoted 11 lines · Juergen Gross
arch/x86/xen/Makefile +0
-0@@ -12,25 +12,46 @@ endif obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_XEN_PV_SMP) += smp_pv.o obj-$(CONFIG_XEN_PVHVM_SMP) += smp_hvm.o
Is there a reason you did not add space here but did add them below?
arch/x86/xen/Makefile endif · line 36
Quoted 11 lines
arch/x86/xen/Makefile +5
-1+ obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o + obj-$(CONFIG_XEN_DEBUG_FS) += debugfs.o + obj-$(CONFIG_XEN_DOM0) += vga.o + obj-$(CONFIG_SWIOTLB_XEN) += pci-swiotlb-xen.o + obj-$(CONFIG_XEN_EFI) += efi.o -obj-$(CONFIG_XEN_PVH) += xen-pvh.o
For the series:
Juergen Gross
maintainerRe: [PATCH 1/4] xen: move pv irq related functions under CONFIG_XEN_PV umbrella
Quoted 9 lines · Boris Ostrovsky
Quoted 8 lines · Juergen Gross
arch/x86/xen/Makefile +0
-0@@ -12,25 +12,46 @@ endif
Quoted 6 lines
arch/x86/xen/Makefile endif · line 47
Quoted 3 lines
arch/x86/xen/Makefile +0
-0obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_XEN_PV_SMP) += smp_pv.o obj-$(CONFIG_XEN_PVHVM_SMP) += smp_hvm.oIs there a reason you did not add space here but did add them below?
I felt like the SMP related stuff should be in one group.
Juergen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Juergen Gross
maintainerRe: [PATCH 1/4] xen: move pv irq related functions under CONFIG_XEN_PV umbrella
In reply to Boris OstrovskyQuoted 9 lines · Boris Ostrovsky
Quoted 8 lines · Juergen Gross
arch/x86/xen/Makefile +0
-0@@ -12,25 +12,46 @@ endif
Quoted 6 lines
arch/x86/xen/Makefile endif · line 47
Quoted 3 lines
arch/x86/xen/Makefile +0
-0obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_XEN_PV_SMP) += smp_pv.o obj-$(CONFIG_XEN_PVHVM_SMP) += smp_hvm.oIs there a reason you did not add space here but did add them below?
I felt like the SMP related stuff should be in one group.
Juergen
Juergen Gross
maintainerPATCH 2/4 xen: move pv specific parts of arch/x86/xen/mmu.c to mmu_pv.c
In reply to Juergen GrossThere are some PV specific functions in arch/x86/xen/mmu.c which can be moved to mmu_pv.c. This in turn enables us to make multicalls.c dependent on CONFIG_XEN_PV.
--- arch/x86/xen/Makefile | 2 +- arch/x86/xen/mmu.c | 186 ----------------------------------------- arch/x86/xen/mmu_pv.c | 138 ++++++++++++++++++++++++++++++ include/xen/interface/memory.h | 6 -- include/xen/xen-ops.h | 133 +++++++++++++++++++---------- 5 files changed, 227 insertions(+), 238 deletions(-)
arch/x86/xen/Makefile +1 -1
@@ -15,7 +15,6 @@ CFLAGS_enlighten_pv.o := $(nostackp) CFLAGS_mmu_pv.o := $(nostackp) obj-y += enlighten.o -obj-y += multicalls.o obj-y += mmu.o obj-y += time.o obj-y += grant-table.o
@@ -34,6 +33,7 @@ obj-$(CONFIG_XEN_PV) += p2m.o obj-$(CONFIG_XEN_PV) += enlighten_pv.o obj-$(CONFIG_XEN_PV) += mmu_pv.o obj-$(CONFIG_XEN_PV) += irq.o +obj-$(CONFIG_XEN_PV) += multicalls.o obj-$(CONFIG_XEN_PV) += xen-asm.o obj-$(CONFIG_XEN_PV) += xen-asm_$(BITS).o
arch/x86/xen/mmu.c +0 -186
198 lines not on this page · raw message
arch/x86/xen/mmu_pv.c +138 -0
150 lines not on this page · raw message
include/xen/interface/memory.h +0 -6
@@ -245,12 +245,6 @@ DEFINE_GUEST_HANDLE_STRUCT(xen_memory_map);/* -* Prevent the balloon driver from changing the memory reservation -* during a driver critical region. -*/ -extern spinlock_t xen_reservation_lock; - -/* * Unmaps the page appearing at a particular GPFN from the specified guest's * pseudophysical address space. * arg == addr of xen_remove_from_physmap_t.
include/xen/xen-ops.h +88 -45
176 lines not on this page · raw message
Signature · 7 lines
2.13.7 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Juergen Gross
maintainerPATCH 2/4 xen: move pv specific parts of arch/x86/xen/mmu.c to mmu_pv.c
In reply to Juergen GrossThere are some PV specific functions in arch/x86/xen/mmu.c which can be moved to mmu_pv.c. This in turn enables us to make multicalls.c dependent on CONFIG_XEN_PV.
--- arch/x86/xen/Makefile | 2 +- arch/x86/xen/mmu.c | 186 ----------------------------------------- arch/x86/xen/mmu_pv.c | 138 ++++++++++++++++++++++++++++++ include/xen/interface/memory.h | 6 -- include/xen/xen-ops.h | 133 +++++++++++++++++++---------- 5 files changed, 227 insertions(+), 238 deletions(-)
arch/x86/xen/Makefile +1 -1
@@ -15,7 +15,6 @@ CFLAGS_enlighten_pv.o := $(nostackp) CFLAGS_mmu_pv.o := $(nostackp) obj-y += enlighten.o -obj-y += multicalls.o obj-y += mmu.o obj-y += time.o obj-y += grant-table.o
@@ -34,6 +33,7 @@ obj-$(CONFIG_XEN_PV) += p2m.o obj-$(CONFIG_XEN_PV) += enlighten_pv.o obj-$(CONFIG_XEN_PV) += mmu_pv.o obj-$(CONFIG_XEN_PV) += irq.o +obj-$(CONFIG_XEN_PV) += multicalls.o obj-$(CONFIG_XEN_PV) += xen-asm.o obj-$(CONFIG_XEN_PV) += xen-asm_$(BITS).o
arch/x86/xen/mmu.c +0 -186
198 lines not on this page · raw message
arch/x86/xen/mmu_pv.c +138 -0
150 lines not on this page · raw message
include/xen/interface/memory.h +0 -6
@@ -245,12 +245,6 @@ DEFINE_GUEST_HANDLE_STRUCT(xen_memory_map);/* -* Prevent the balloon driver from changing the memory reservation -* during a driver critical region. -*/ -extern spinlock_t xen_reservation_lock; - -/* * Unmaps the page appearing at a particular GPFN from the specified guest's * pseudophysical address space. * arg == addr of xen_remove_from_physmap_t.
include/xen/xen-ops.h +88 -45
176 lines not on this page · raw message
Signature · 1 line
2.13.7
Juergen Gross
maintainerPATCH 3/4 xen: link platform-pci-unplug.o only if CONFIG_XEN_PVHVM
In reply to Juergen GrossInstead of using one large #ifdef CONFIG_XEN_PVHVM in arch/x86/xen/platform-pci-unplug.c add the object file depending on CONFIG_XEN_PVHVM being set.
--- arch/x86/xen/Makefile | 2 +- arch/x86/xen/platform-pci-unplug.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
arch/x86/xen/Makefile +1 -1
@@ -19,11 +19,11 @@ obj-y += mmu.o obj-y += time.o obj-y += grant-table.o obj-y += suspend.o -obj-y += platform-pci-unplug.o obj-$(CONFIG_XEN_PVHVM) += enlighten_hvm.o obj-$(CONFIG_XEN_PVHVM) += mmu_hvm.o obj-$(CONFIG_XEN_PVHVM) += suspend_hvm.o +obj-$(CONFIG_XEN_PVHVM) += platform-pci-unplug.o obj-$(CONFIG_XEN_PV) += setup.o obj-$(CONFIG_XEN_PV) += apic.o
arch/x86/xen/platform-pci-unplug.c +0 -2
@@ -30,7 +30,6 @@#define XEN_PLATFORM_ERR_PROTOCOL -2#define XEN_PLATFORM_ERR_BLACKLIST -3 -#ifdef CONFIG_XEN_PVHVM /* store the value of xen_emul_unplug after the unplug is done */ static int xen_platform_pci_unplug;static int xen_emul_unplug;
@@ -214,4 +213,3 @@ static int __init parse_xen_emul_unplug(char *arg)return 0 ; }early_param ("xen_emul_unplug" , parse_xen_emul_unplug); -#endif
Signature · 7 lines
2.13.7 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Juergen Gross
maintainerPATCH 3/4 xen: link platform-pci-unplug.o only if CONFIG_XEN_PVHVM
In reply to Juergen GrossInstead of using one large #ifdef CONFIG_XEN_PVHVM in arch/x86/xen/platform-pci-unplug.c add the object file depending on CONFIG_XEN_PVHVM being set.
--- arch/x86/xen/Makefile | 2 +- arch/x86/xen/platform-pci-unplug.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
arch/x86/xen/Makefile +1 -1
@@ -19,11 +19,11 @@ obj-y += mmu.o obj-y += time.o obj-y += grant-table.o obj-y += suspend.o -obj-y += platform-pci-unplug.o obj-$(CONFIG_XEN_PVHVM) += enlighten_hvm.o obj-$(CONFIG_XEN_PVHVM) += mmu_hvm.o obj-$(CONFIG_XEN_PVHVM) += suspend_hvm.o +obj-$(CONFIG_XEN_PVHVM) += platform-pci-unplug.o obj-$(CONFIG_XEN_PV) += setup.o obj-$(CONFIG_XEN_PV) += apic.o
arch/x86/xen/platform-pci-unplug.c +0 -2
@@ -30,7 +30,6 @@#define XEN_PLATFORM_ERR_PROTOCOL -2#define XEN_PLATFORM_ERR_BLACKLIST -3 -#ifdef CONFIG_XEN_PVHVM /* store the value of xen_emul_unplug after the unplug is done */ static int xen_platform_pci_unplug;static int xen_emul_unplug;
@@ -214,4 +213,3 @@ static int __init parse_xen_emul_unplug(char *arg)return 0 ; }early_param ("xen_emul_unplug" , parse_xen_emul_unplug); -#endif
Signature · 1 line
2.13.7
Juergen Gross
maintainerPATCH 4/4 xen: add SPDX identifier in arch/x86/xen files
In reply to Juergen Gross--- 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 | 2 ++ arch/x86/xen/mmu_pv.c | 2 ++ arch/x86/xen/p2m.c | 2 ++ arch/x86/xen/pci-swiotlb-xen.c | 2 ++ arch/x86/xen/platform-pci-unplug.c | 16 ++-------------- arch/x86/xen/vdso.h | 2 ++ arch/x86/xen/xen-pvh.S | 15 ++------------- 11 files changed, 20 insertions(+), 64 deletions(-)
arch/x86/xen/efi.c +1 -13
@@ -1,18 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2014 Oracle Co., Daniel Kiper -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <linux/bitops.h>
arch/x86/xen/enlighten.c +2 -0
@@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 +#ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG #include <linux/bootmem.h> #endif
arch/x86/xen/enlighten_hvm.c +2 -0
@@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/acpi.h> #include <linux/cpu.h> #include <linux/kexec.h>
arch/x86/xen/grant-table.c +1 -24
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT /****************************************************************************** * grant_table.c * x86 specific part
@@ -8,30 +9,6 @@* Copyright (c) 2004-2005, K A Fraser * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp> * VA Linux Systems Japan. Split out x86 specific part. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License version 2 -* as published by the Free Software Foundation; or, when distributed -* separately from the Linux kernel or incorporated into other -* software packages, subject to the following license: -* -* Permission is hereby granted, free of charge, to any person obtaining a copy -* of this source file (the "Software"), to deal in the Software without -* restriction, including without limitation the rights to use, copy, modify, -* merge, publish, distribute, sublicense, and/or sell copies of the Software, -* and to permit persons to whom the Software is furnished to do so, subject to -* the following conditions: -* -* The above copyright notice and this permission notice shall be included in -* all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -* IN THE SOFTWARE. */ #include <linux/sched.h>
arch/x86/xen/mmu.c +2 -0
@@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/pfn.h> #include <asm/xen/page.h> #include <asm/xen/hypercall.h>
arch/x86/xen/mmu_pv.c +2 -0
@@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 +/* * Xen mmu operations *
arch/x86/xen/p2m.c +2 -0
@@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 +/* * Xen leaves the responsibility for maintaining p2m mappings to the * guests themselves, but it must also access and update the p2m array
arch/x86/xen/pci-swiotlb-xen.c +2 -0
@@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Glue code to lib/swiotlb-xen.c */ #include <linux/dma-mapping.h>
arch/x86/xen/platform-pci-unplug.c +2 -14
@@ -1,22 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 +/****************************************************************************** * platform-pci-unplug.c * * Xen platform PCI device driver * Copyright (c) 2010, Citrix -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program; if not, write to the Free Software Foundation, Inc., 59 Temple -* Place - Suite 330, Boston, MA 02111-1307 USA. -* */ #include <linux/init.h>
arch/x86/xen/vdso.h +2 -0
@@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Bit used for the pseudo-hwcap for non-negative segments. We use bit 1 to avoid bugs in some versions of glibc when bit 0 is used; the choice is otherwise arbitrary. */
arch/x86/xen/xen-pvh.S +2 -13
@@ -1,18 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + /* * Copyright C 2016, Oracle and/or its affiliates. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see <http://www.gnu.org/licenses/>. */ .code32
Signature · 7 lines
2.13.7 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Juergen Gross
maintainerPATCH 4/4 xen: add SPDX identifier in arch/x86/xen files
In reply to Juergen Gross--- 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 | 2 ++ arch/x86/xen/mmu_pv.c | 2 ++ arch/x86/xen/p2m.c | 2 ++ arch/x86/xen/pci-swiotlb-xen.c | 2 ++ arch/x86/xen/platform-pci-unplug.c | 16 ++-------------- arch/x86/xen/vdso.h | 2 ++ arch/x86/xen/xen-pvh.S | 15 ++------------- 11 files changed, 20 insertions(+), 64 deletions(-)
arch/x86/xen/efi.c +1 -13
@@ -1,18 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2014 Oracle Co., Daniel Kiper -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <linux/bitops.h>
arch/x86/xen/enlighten.c +2 -0
@@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 +#ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG #include <linux/bootmem.h> #endif
arch/x86/xen/enlighten_hvm.c +2 -0
@@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/acpi.h> #include <linux/cpu.h> #include <linux/kexec.h>
arch/x86/xen/grant-table.c +1 -24
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT /****************************************************************************** * grant_table.c * x86 specific part
@@ -8,30 +9,6 @@* Copyright (c) 2004-2005, K A Fraser * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp> * VA Linux Systems Japan. Split out x86 specific part. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License version 2 -* as published by the Free Software Foundation; or, when distributed -* separately from the Linux kernel or incorporated into other -* software packages, subject to the following license: -* -* Permission is hereby granted, free of charge, to any person obtaining a copy -* of this source file (the "Software"), to deal in the Software without -* restriction, including without limitation the rights to use, copy, modify, -* merge, publish, distribute, sublicense, and/or sell copies of the Software, -* and to permit persons to whom the Software is furnished to do so, subject to -* the following conditions: -* -* The above copyright notice and this permission notice shall be included in -* all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -* IN THE SOFTWARE. */ #include <linux/sched.h>
arch/x86/xen/mmu.c +2 -0
@@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/pfn.h> #include <asm/xen/page.h> #include <asm/xen/hypercall.h>
arch/x86/xen/mmu_pv.c +2 -0
@@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 +/* * Xen mmu operations *
arch/x86/xen/p2m.c +2 -0
@@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 +/* * Xen leaves the responsibility for maintaining p2m mappings to the * guests themselves, but it must also access and update the p2m array
arch/x86/xen/pci-swiotlb-xen.c +2 -0
@@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Glue code to lib/swiotlb-xen.c */ #include <linux/dma-mapping.h>
arch/x86/xen/platform-pci-unplug.c +2 -14
@@ -1,22 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 +/****************************************************************************** * platform-pci-unplug.c * * Xen platform PCI device driver * Copyright (c) 2010, Citrix -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program; if not, write to the Free Software Foundation, Inc., 59 Temple -* Place - Suite 330, Boston, MA 02111-1307 USA. -* */ #include <linux/init.h>
arch/x86/xen/vdso.h +2 -0
@@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Bit used for the pseudo-hwcap for non-negative segments. We use bit 1 to avoid bugs in some versions of glibc when bit 0 is used; the choice is otherwise arbitrary. */
arch/x86/xen/xen-pvh.S +2 -13
@@ -1,18 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + /* * Copyright C 2016, Oracle and/or its affiliates. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see <http://www.gnu.org/licenses/>. */ .code32
Signature · 1 line
2.13.7
Juergen Gross
maintainerQuoted 20 lines · Juergen Gross
Some Xen related cleanups:
- move some pv-only code fromCONFIG_XENtoCONFIG_XEN_PV
- useCONFIG_XEN_PVHVMinMakefileinstead of #ifdef around a complete source
- add SPDX identifier where missingJuergen Gross (4):
xen: move pv irq related functions underCONFIG_XEN_PVumbrella
xen: move pv specific parts ofarch/x86/xen/mmu.ctommu_pv.c
xen: link platform-pci-unplug.o only ifCONFIG_XEN_PVHVM
xen: add SPDX identifier inarch/x86/xenfilesarch/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 +++++++++++++++++++++++++++
Quoted 9 lines
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?
Juergen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Juergen Gross
maintainerQuoted 20 lines · Juergen Gross
Some Xen related cleanups:
- move some pv-only code fromCONFIG_XENtoCONFIG_XEN_PV
- useCONFIG_XEN_PVHVMinMakefileinstead of #ifdef around a complete source
- add SPDX identifier where missingJuergen Gross (4):
xen: move pv irq related functions underCONFIG_XEN_PVumbrella
xen: move pv specific parts ofarch/x86/xen/mmu.ctommu_pv.c
xen: link platform-pci-unplug.o only ifCONFIG_XEN_PVHVM
xen: add SPDX identifier inarch/x86/xenfilesarch/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 +++++++++++++++++++++++++++
Quoted 9 lines
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?
Juergen
Boris Ostrovsky
reviewerQuoted 30 lines · Juergen Gross
Quoted 20 lines · Juergen Gross
Some Xen related cleanups:
- move some pv-only code fromCONFIG_XENtoCONFIG_XEN_PV
- useCONFIG_XEN_PVHVMinMakefileinstead of #ifdef around a complete source
- add SPDX identifier where missingJuergen Gross (4):
xen: move pv irq related functions underCONFIG_XEN_PVumbrella
xen: move pv specific parts ofarch/x86/xen/mmu.ctommu_pv.c
xen: link platform-pci-unplug.o only ifCONFIG_XEN_PVHVM
xen: add SPDX identifier inarch/x86/xenfilesarch/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 +++++++++++++++++++++++++++Quoted 9 lines
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(-)
Quoted 1 line
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
-boris
-boris
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Boris Ostrovsky
reviewerQuoted 30 lines · Juergen Gross
Quoted 20 lines · Juergen Gross
Some Xen related cleanups:
- move some pv-only code fromCONFIG_XENtoCONFIG_XEN_PV
- useCONFIG_XEN_PVHVMinMakefileinstead of #ifdef around a complete source
- add SPDX identifier where missingJuergen Gross (4):
xen: move pv irq related functions underCONFIG_XEN_PVumbrella
xen: move pv specific parts ofarch/x86/xen/mmu.ctommu_pv.c
xen: link platform-pci-unplug.o only ifCONFIG_XEN_PVHVM
xen: add SPDX identifier inarch/x86/xenfilesarch/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 +++++++++++++++++++++++++++Quoted 9 lines
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(-)
Quoted 1 line
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
-boris
-boris
Juergen Gross
maintainerQuoted 47 lines · Boris Ostrovsky
Quoted 30 lines · Juergen Gross
Quoted 20 lines · Juergen Gross
Some Xen related cleanups:
- move some pv-only code fromCONFIG_XENtoCONFIG_XEN_PV
- useCONFIG_XEN_PVHVMinMakefileinstead of #ifdef around a complete source
- add SPDX identifier where missingJuergen Gross (4):
xen: move pv irq related functions underCONFIG_XEN_PVumbrella
xen: move pv specific parts ofarch/x86/xen/mmu.ctommu_pv.c
xen: link platform-pci-unplug.o only ifCONFIG_XEN_PVHVM
xen: add SPDX identifier inarch/x86/xenfilesarch/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 +++++++++++++++++++++++++++Quoted 9 lines
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(-)Quoted 1 line
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_XENBUILD_INTERRUPT3(xen_hvm_callback_vector, HYPERVISOR_CALLBACK_VECTOR, xen_evtchn_do_upcall)
+#endifand
Quoted 7 lines
+#ifdef
CONFIG_XEN
apicinterrupt3HYPERVISOR_CALLBACK_VECTOR\
xen_hvm_callback_vectorxen_evtchn_do_upcall
+#endifshould be under
XEN_PVHVM
Hmm, right. Do you want to change that while committing or should I send V2?
Juergen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Juergen Gross
maintainerQuoted 47 lines · Boris Ostrovsky
Quoted 30 lines · Juergen Gross
Quoted 20 lines · Juergen Gross
Some Xen related cleanups:
- move some pv-only code fromCONFIG_XENtoCONFIG_XEN_PV
- useCONFIG_XEN_PVHVMinMakefileinstead of #ifdef around a complete source
- add SPDX identifier where missingJuergen Gross (4):
xen: move pv irq related functions underCONFIG_XEN_PVumbrella
xen: move pv specific parts ofarch/x86/xen/mmu.ctommu_pv.c
xen: link platform-pci-unplug.o only ifCONFIG_XEN_PVHVM
xen: add SPDX identifier inarch/x86/xenfilesarch/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 +++++++++++++++++++++++++++Quoted 9 lines
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(-)Quoted 1 line
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_XENBUILD_INTERRUPT3(xen_hvm_callback_vector, HYPERVISOR_CALLBACK_VECTOR, xen_evtchn_do_upcall)
+#endifand
Quoted 7 lines
+#ifdef
CONFIG_XEN
apicinterrupt3HYPERVISOR_CALLBACK_VECTOR\
xen_hvm_callback_vectorxen_evtchn_do_upcall
+#endifshould be under
XEN_PVHVM
Hmm, right. Do you want to change that while committing or should I send V2?
Juergen
Boris Ostrovsky
reviewerQuoted 53 lines · Juergen Gross
Quoted 52 lines · Boris Ostrovsky
Quoted 30 lines · Juergen Gross
Quoted 20 lines · Juergen Gross
Some Xen related cleanups:
- move some pv-only code fromCONFIG_XENtoCONFIG_XEN_PV
- useCONFIG_XEN_PVHVMinMakefileinstead of #ifdef around a complete source
- add SPDX identifier where missingJuergen Gross (4):
xen: move pv irq related functions underCONFIG_XEN_PVumbrella
xen: move pv specific parts ofarch/x86/xen/mmu.ctommu_pv.c
xen: link platform-pci-unplug.o only ifCONFIG_XEN_PVHVM
xen: add SPDX identifier inarch/x86/xenfilesarch/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 +++++++++++++++++++++++++++Quoted 9 lines
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(-)Quoted 1 line
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_XENBUILD_INTERRUPT3(xen_hvm_callback_vector, HYPERVISOR_CALLBACK_VECTOR, xen_evtchn_do_upcall)
+#endifand
+#ifdef
CONFIG_XEN
apicinterrupt3HYPERVISOR_CALLBACK_VECTOR\
xen_hvm_callback_vectorxen_evtchn_do_upcall
+#endif
Quoted 3 lines
Quoted 1 line
should be under
XEN_PVHVMHmm, 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
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Boris Ostrovsky
reviewerQuoted 53 lines · Juergen Gross
Quoted 52 lines · Boris Ostrovsky
Quoted 30 lines · Juergen Gross
Quoted 20 lines · Juergen Gross
Some Xen related cleanups:
- move some pv-only code fromCONFIG_XENtoCONFIG_XEN_PV
- useCONFIG_XEN_PVHVMinMakefileinstead of #ifdef around a complete source
- add SPDX identifier where missingJuergen Gross (4):
xen: move pv irq related functions underCONFIG_XEN_PVumbrella
xen: move pv specific parts ofarch/x86/xen/mmu.ctommu_pv.c
xen: link platform-pci-unplug.o only ifCONFIG_XEN_PVHVM
xen: add SPDX identifier inarch/x86/xenfilesarch/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 +++++++++++++++++++++++++++Quoted 9 lines
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(-)Quoted 1 line
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_XENBUILD_INTERRUPT3(xen_hvm_callback_vector, HYPERVISOR_CALLBACK_VECTOR, xen_evtchn_do_upcall)
+#endifand
+#ifdef
CONFIG_XEN
apicinterrupt3HYPERVISOR_CALLBACK_VECTOR\
xen_hvm_callback_vectorxen_evtchn_do_upcall
+#endif
Quoted 3 lines
Quoted 1 line
should be under
XEN_PVHVMHmm, 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