From: Andrew Cooper Date: Fri, 26 Jul 2019 09:54:41 +0000 (+0100) Subject: x86/shim: Refresh pvshim_defconfig X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~1778 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=32b1d628;p=xen.git x86/shim: Refresh pvshim_defconfig * Add a dependency so the shim gets rebuilt when pvshim_defconfig changes. * Default to the NULL scheduler now that it works with vcpu online/offline. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- diff --git a/tools/firmware/xen-dir/Makefile b/tools/firmware/xen-dir/Makefile index 83597f0017..7435421251 100644 --- a/tools/firmware/xen-dir/Makefile +++ b/tools/firmware/xen-dir/Makefile @@ -41,7 +41,7 @@ linkfarm.stamp: $(DEP_DIRS) $(DEP_FILES) FORCE $(D): linkfarm.stamp $(MAKE) -C $(D)/xen distclean -$(D)/xen/.config: $(D) +$(D)/xen/.config: $(D) $(D)/xen/arch/x86/configs/pvshim_defconfig $(MAKE) -C $(@D) KBUILD_DEFCONFIG=pvshim_defconfig XEN_CONFIG_EXPERT=y defconfig xen-shim: $(D)/xen/.config diff --git a/xen/arch/x86/configs/pvshim_defconfig b/xen/arch/x86/configs/pvshim_defconfig index 9710aa6238..a5e8e14171 100644 --- a/xen/arch/x86/configs/pvshim_defconfig +++ b/xen/arch/x86/configs/pvshim_defconfig @@ -5,6 +5,7 @@ CONFIG_PVH_GUEST=y CONFIG_PV_SHIM=y CONFIG_PV_SHIM_EXCLUSIVE=y CONFIG_NR_CPUS=32 +CONFIG_SCHED_NULL=y # Disable features not used by the PV shim # CONFIG_SHADOW_PAGING is not set # CONFIG_BIGMEM is not set @@ -13,10 +14,10 @@ CONFIG_NR_CPUS=32 # CONFIG_KEXEC is not set # CONFIG_XENOPROF is not set # CONFIG_XSM is not set +# CONFIG_SCHED_CREDIT is not set # CONFIG_SCHED_CREDIT2 is not set # CONFIG_SCHED_RTDS is not set # CONFIG_SCHED_ARINC653 is not set -# CONFIG_SCHED_NULL is not set # CONFIG_LIVEPATCH is not set # CONFIG_SUPPRESS_DUPLICATE_SYMBOL_WARNINGS is not set # CONFIG_DEBUG is not set