From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>,
Wei Liu <wei.liu2@citrix.com>, Jan Beulich <jbeulich@suse.com>,
Andrew Cooper <andrew.cooper3@citrix.com>
Subject: [PATCH v2 4/7] x86/shim: use credit scheduler
Date: Fri, 19 Jan 2018 15:34:55 +0000 [thread overview]
Message-ID: <20180119153458.22535-5-wei.liu2@citrix.com> (raw)
In-Reply-To: <20180119153458.22535-1-wei.liu2@citrix.com>
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 <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
---
docs/man/xl.cfg.pod.5.in | 2 +-
tools/firmware/xen-dir/shim.config | 7 +++----
tools/libxl/libxl_internal.h | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
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<pvshim_cmdline="STRING">
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<pvshim_extra="STRING">
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)
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2018-01-19 15:36 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-19 15:34 [PATCH v2 0/7] Fixes and improvements to pvshim Wei Liu
2018-01-19 15:34 ` [PATCH v2 1/7] Update shim.config Wei Liu
2018-01-19 15:34 ` [PATCH v2 2/7] libxl: remove whitespaces introduced in 62982da926 Wei Liu
2018-01-19 15:34 ` [PATCH v2 3/7] x86/guest: clean up guest/xen.h Wei Liu
2018-01-19 15:55 ` Roger Pau Monné
2018-01-19 16:01 ` Jan Beulich
2018-01-19 15:34 ` Wei Liu [this message]
2018-01-19 16:00 ` [PATCH v2 4/7] x86/shim: use credit scheduler Roger Pau Monné
2018-01-22 15:30 ` Ian Jackson
2018-01-19 15:34 ` [PATCH v2 5/7] x86: relocate pvh_info Wei Liu
2018-01-19 16:29 ` Roger Pau Monné
2018-01-19 16:39 ` Wei Liu
2018-01-22 10:31 ` Jan Beulich
2018-01-22 12:35 ` Wei Liu
2018-01-22 12:44 ` Roger Pau Monné
2018-01-22 12:46 ` Wei Liu
2018-01-22 12:54 ` Jan Beulich
2018-01-22 12:10 ` Wei Liu
2018-01-19 15:34 ` [PATCH v2 6/7] Revert "x86/boot: Map more than the first 16MB" Wei Liu
2018-01-19 15:34 ` [PATCH v2 7/7] libxl: lower shim related message to level DEBUG Wei Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180119153458.22535-5-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=jbeulich@suse.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.