From: Doug Goldstein <cardoe@cardoe.com>
To: xen-devel@lists.xen.org
Cc: Wei Liu <wei.liu2@citrix.com>,
Ian Jackson <ian.jackson@eu.citrix.com>,
Doug Goldstein <cardoe@cardoe.com>
Subject: [PATCH 2/2] xendriverdomain: don't depend on legacy /proc/xen
Date: Thu, 12 May 2016 10:29:30 -0500 [thread overview]
Message-ID: <1463066970-39711-2-git-send-email-cardoe@cardoe.com> (raw)
In-Reply-To: <1463066970-39711-1-git-send-email-cardoe@cardoe.com>
xl devd prefers to use /dev/xen/ instead of /proc/xen so the init script
should use the new interface as well and drop the legacy interface. To
check for support this uses /sys/hypervisor which has been present since
2.6.18 Xen kernels. Fix bad whitespace at the same time.
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
tools/hotplug/Linux/init.d/xendriverdomain.in | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/tools/hotplug/Linux/init.d/xendriverdomain.in b/tools/hotplug/Linux/init.d/xendriverdomain.in
index 8d4592a..830aa5b 100644
--- a/tools/hotplug/Linux/init.d/xendriverdomain.in
+++ b/tools/hotplug/Linux/init.d/xendriverdomain.in
@@ -27,23 +27,12 @@ test -f $xendriverdomain_config/xendriverdomain && . $xendriverdomain_config/xen
XLDEVD_PIDFILE=/var/run/xldevd.pid
# not running in Xen dom0 or domU
-if ! test -d /proc/xen ; then
+if ! grep -q '^xen' /sys/hypervisor/type ; then
exit 0
fi
-# mount xenfs in dom0 or domU with a pv_ops kernel
-if test "x$1" = xstart && \
- ! test -f /proc/xen/capabilities && \
- ! grep '^xenfs ' /proc/mounts >/dev/null;
-then
- mount -t xenfs xenfs /proc/xen
-fi
-
# run this script only in domU:
-# no capabilities file in xenlinux domU kernel
-# empty capabilities file in pv_ops domU kernel
-if ! test -f /proc/xen/capabilities || \
- grep -q "control_d" /proc/xen/capabilities ; then
+if grep -q '00000000-0000-0000-0000-000000000000' /sys/hypervisor/uuid; then
exit 0
fi
@@ -52,7 +41,7 @@ do_start () {
${sbindir}/xl devd --pidfile=$XLDEVD_PIDFILE $XLDEVD_ARGS
}
do_stop () {
- echo Stopping xl devd...
+ echo Stopping xl devd...
if read 2>/dev/null <$XLDEVD_PIDFILE pid; then
kill $pid
while kill -9 $pid >/dev/null 2>&1; do sleep 1; done
@@ -71,7 +60,7 @@ case "$1" in
echo >&2 'Reload not available; use force-reload'; exit 1
;;
force-reload|restart)
- do_stop
+ do_stop
do_start
;;
*)
--
2.7.4 (Apple Git-66)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-05-12 15:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-12 15:29 [PATCH-for-4.7 1/2] xendriverdomain: use POSIX sh and not bash Doug Goldstein
2016-05-12 15:29 ` Doug Goldstein [this message]
2016-05-12 15:56 ` [PATCH 2/2] xendriverdomain: don't depend on legacy /proc/xen Wei Liu
2016-05-12 15:56 ` [PATCH-for-4.7 1/2] xendriverdomain: use POSIX sh and not bash Wei Liu
2016-05-12 17:02 ` 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=1463066970-39711-2-git-send-email-cardoe@cardoe.com \
--to=cardoe@cardoe.com \
--cc=ian.jackson@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).