From: Wei Liu Date: Thu, 18 Jan 2018 12:32:35 +0000 (+0000) Subject: x86/shim: use credit scheduler X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~723 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=831cbe98f6d13e24a3e6521ddd35102729e1d505;p=xen.git x86/shim: use credit scheduler Remove sched=null from shim cmdline and doc We use the default scheduler (credit1 as of writing). The NULL scheduler still has bugs to fix. Update shim.config. Signed-off-by: Wei Liu Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper Acked-by: Ian Jackson --- diff --git a/docs/man/xl.cfg.pod.5.in b/docs/man/xl.cfg.pod.5.in index 30fe4b8531..a699367779 100644 --- a/docs/man/xl.cfg.pod.5.in +++ b/docs/man/xl.cfg.pod.5.in @@ -531,7 +531,7 @@ Ignored if pvhsim is false. =item B Command line for the shim. -Default is "pv-shim console=xen,pv sched=null". +Default is "pv-shim console=xen,pv". Ignored if pvhsim is false. =item B diff --git a/tools/firmware/xen-dir/shim.config b/tools/firmware/xen-dir/shim.config index d5bd516632..effbbd90c9 100644 --- a/tools/firmware/xen-dir/shim.config +++ b/tools/firmware/xen-dir/shim.config @@ -49,10 +49,9 @@ CONFIG_SCHED_CREDIT=y # CONFIG_SCHED_CREDIT2 is not set # CONFIG_SCHED_RTDS is not set # CONFIG_SCHED_ARINC653 is not set -CONFIG_SCHED_NULL=y -# CONFIG_SCHED_CREDIT_DEFAULT is not set -CONFIG_SCHED_NULL_DEFAULT=y -CONFIG_SCHED_DEFAULT="null" +# CONFIG_SCHED_NULL is not set +CONFIG_SCHED_CREDIT_DEFAULT=y +CONFIG_SCHED_DEFAULT="credit" # CONFIG_LIVEPATCH is not set # CONFIG_SUPPRESS_DUPLICATE_SYMBOL_WARNINGS is not set CONFIG_CMDLINE="" diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 0f89364466..7ff9a67e50 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -119,7 +119,7 @@ #define DOMID_XS_PATH "domid" #define INVALID_DOMID ~0 #define PVSHIM_BASENAME "xen-shim" -#define PVSHIM_CMDLINE "pv-shim console=xen,pv sched=null" +#define PVSHIM_CMDLINE "pv-shim console=xen,pv" /* Size macros. */ #define __AC(X,Y) (X##Y)