Yu Zhiguo
2010-Jun-19 07:39 UTC
[Xen-devel] [PATCH] xencommons: modprobe xenfs if it not be loaded
If xenfs is compiled as a module, now cannot complete ''service xencommons start'', modprobe xenfs can fix it. Signed-off-by: Yu Zhiguo <yuzg@cn.fujitsu.com> diff -r 659e4b69d26b -r f6b44890c298 tools/hotplug/Linux/init.d/xencommons --- a/tools/hotplug/Linux/init.d/xencommons Sat Jun 19 22:24:09 2010 +0800 +++ b/tools/hotplug/Linux/init.d/xencommons Sat Jun 19 23:43:10 2010 +0800 @@ -24,16 +24,21 @@ XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid shopt -s extglob -if test "x$1" = xstart && \ - test -d /proc/xen && \ - ! test -d /proc/xen/capabilities && \ - grep '' xenfs$'' /proc/filesystems >/dev/null && \ - ! grep ''^xenfs '' /proc/mounts >/dev/null; -then - mount -t xenfs xenfs /proc/xen +if test "x$1" = xstart; then + if ! grep '' xenfs$'' /proc/filesystems >/dev/null; then + test -x /sbin/modprobe && /sbin/modprobe xenfs + fi + if test -d /proc/xen && \ + ! test -d /proc/xen/capabilities && \ + grep '' xenfs$'' /proc/filesystems >/dev/null && \ + ! grep ''^xenfs '' /proc/mounts >/dev/null; + then + mount -t xenfs xenfs /proc/xen + fi fi -if ! grep -q "control_d" /proc/xen/capabilities ; then +if ! test -e /proc/xen/capabilities || \ + ! grep -q "control_d" /proc/xen/capabilities ; then exit 0 fi _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Yu Zhiguo
2010-Jun-19 08:10 UTC
Re: [Xen-devel] [PATCH] xencommons: modprobe xenfs if it not be loaded
Do a small fix in order to be compatible with the old Dom0 kernel which has no xenfs.ko. ----------- If xenfs is compiled as a module, now cannot complete ''service xencommons start'', modprobe xenfs can fix it. Signed-off-by: Yu Zhiguo <yuzg@cn.fujitsu.com> diff -r b9c541d9c138 -r 96978e701b26 tools/hotplug/Linux/init.d/xencommons --- a/tools/hotplug/Linux/init.d/xencommons Tue Jun 15 13:27:14 2010 +0100 +++ b/tools/hotplug/Linux/init.d/xencommons Sun Jun 20 00:11:45 2010 +0800 @@ -24,16 +24,21 @@ XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid shopt -s extglob -if test "x$1" = xstart && \ - test -d /proc/xen && \ - ! test -d /proc/xen/capabilities && \ - grep '' xenfs$'' /proc/filesystems >/dev/null && \ - ! grep ''^xenfs '' /proc/mounts >/dev/null; -then - mount -t xenfs xenfs /proc/xen +if test "x$1" = xstart; then + if ! grep '' xenfs$'' /proc/filesystems >/dev/null; then + test -x /sbin/modprobe && /sbin/modprobe xenfs 2>/dev/null + fi + if test -d /proc/xen && \ + ! test -d /proc/xen/capabilities && \ + grep '' xenfs$'' /proc/filesystems >/dev/null && \ + ! grep ''^xenfs '' /proc/mounts >/dev/null; + then + mount -t xenfs xenfs /proc/xen + fi fi -if ! grep -q "control_d" /proc/xen/capabilities ; then +if ! test -e /proc/xen/capabilities || \ + ! grep -q "control_d" /proc/xen/capabilities ; then exit 0 fi _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Jeremy Fitzhardinge
2010-Jun-21 09:46 UTC
Re: [Xen-devel] [PATCH] xencommons: modprobe xenfs if it not be loaded
On 06/19/2010 09:10 AM, Yu Zhiguo wrote:> Do a small fix in order to be compatible with the old Dom0 kernel > which has no xenfs.ko. > > ----------- > > If xenfs is compiled as a module, now cannot complete > ''service xencommons start'', modprobe xenfs can fix it. >It should just be sufficient to explicitly mount /proc/xen, which will trigger a modprobe if necessary. J> Signed-off-by: Yu Zhiguo <yuzg@cn.fujitsu.com> > > diff -r b9c541d9c138 -r 96978e701b26 tools/hotplug/Linux/init.d/xencommons > --- a/tools/hotplug/Linux/init.d/xencommons Tue Jun 15 13:27:14 2010 +0100 > +++ b/tools/hotplug/Linux/init.d/xencommons Sun Jun 20 00:11:45 2010 +0800 > @@ -24,16 +24,21 @@ > XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid > shopt -s extglob > > -if test "x$1" = xstart && \ > - test -d /proc/xen && \ > - ! test -d /proc/xen/capabilities && \ > - grep '' xenfs$'' /proc/filesystems >/dev/null && \ > - ! grep ''^xenfs '' /proc/mounts >/dev/null; > -then > - mount -t xenfs xenfs /proc/xen > +if test "x$1" = xstart; then > + if ! grep '' xenfs$'' /proc/filesystems >/dev/null; then > + test -x /sbin/modprobe && /sbin/modprobe xenfs 2>/dev/null > + fi > + if test -d /proc/xen && \ > + ! test -d /proc/xen/capabilities && \ > + grep '' xenfs$'' /proc/filesystems >/dev/null && \ > + ! grep ''^xenfs '' /proc/mounts >/dev/null; > + then > + mount -t xenfs xenfs /proc/xen > + fi > fi > > -if ! grep -q "control_d" /proc/xen/capabilities ; then > +if ! test -e /proc/xen/capabilities || \ > + ! grep -q "control_d" /proc/xen/capabilities ; then > exit 0 > fi > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel > >_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Jackson
2010-Jun-21 14:05 UTC
Re: [Xen-devel] [PATCH] xencommons: modprobe xenfs if it not be loaded
Jeremy Fitzhardinge writes ("Re: [Xen-devel] [PATCH] xencommons: modprobe
xenfs if it not be loaded"):> It should just be sufficient to explicitly mount /proc/xen, which will
> trigger a modprobe if necessary.
That sounds like a Nak of the patch to me. Unfortunately it has
already been applied (21641).
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Jeremy Fitzhardinge
2010-Jun-21 14:45 UTC
Re: [Xen-devel] [PATCH] xencommons: modprobe xenfs if it not be loaded
On 06/21/2010 03:05 PM, Ian Jackson wrote:> Jeremy Fitzhardinge writes ("Re: [Xen-devel] [PATCH] xencommons: modprobe xenfs if it not be loaded"): > >> It should just be sufficient to explicitly mount /proc/xen, which will >> trigger a modprobe if necessary. >> > That sounds like a Nak of the patch to me. Unfortunately it has > already been applied (21641). >Is that tangled up in staging? J _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Jackson
2010-Jun-21 16:31 UTC
Re: [Xen-devel] [PATCH] xencommons: modprobe xenfs if it not be loaded
Jeremy Fitzhardinge writes ("Re: [Xen-devel] [PATCH] xencommons: modprobe
xenfs if it not be loaded"):> Is that tangled up in staging?
Yes, it''s in staging but not in main xen-unstable.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Keir Fraser
2010-Jun-21 17:28 UTC
Re: [Xen-devel] [PATCH] xencommons: modprobe xenfs if it not be loaded
On 21/06/2010 15:05, "Ian Jackson" <Ian.Jackson@eu.citrix.com> wrote:> Jeremy Fitzhardinge writes ("Re: [Xen-devel] [PATCH] xencommons: modprobe > xenfs if it not be loaded"): >> It should just be sufficient to explicitly mount /proc/xen, which will >> trigger a modprobe if necessary. > > That sounds like a Nak of the patch to me. Unfortunately it has > already been applied (21641).I can revert it. Should I leave tools patches unapplied for a week, perhaps? -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Keir Fraser
2010-Jun-21 17:29 UTC
Re: [Xen-devel] [PATCH] xencommons: modprobe xenfs if it not be loaded
On 21/06/2010 15:45, "Jeremy Fitzhardinge" <jeremy@goop.org> wrote:>> That sounds like a Nak of the patch to me. Unfortunately it has >> already been applied (21641). >> > > Is that tangled up in staging?We haven''t pushed automatically from staging in weeks. Possibly months. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Jeremy Fitzhardinge
2010-Jun-21 20:13 UTC
Re: [Xen-devel] [PATCH] xencommons: modprobe xenfs if it not be loaded
On 06/21/2010 06:28 PM, Keir Fraser wrote:> On 21/06/2010 15:05, "Ian Jackson" <Ian.Jackson@eu.citrix.com> wrote: > > >> Jeremy Fitzhardinge writes ("Re: [Xen-devel] [PATCH] xencommons: modprobe >> xenfs if it not be loaded"): >> >>> It should just be sufficient to explicitly mount /proc/xen, which will >>> trigger a modprobe if necessary. >>> >> That sounds like a Nak of the patch to me. Unfortunately it has >> already been applied (21641). >> > I can revert it. >I think so.> Should I leave tools patches unapplied for a week, perhaps? >You mean the policy is that if a patch is not interesting enough to draw comment, you''ll accept it by default after a week? What about waiting until there are either positive or negative comments, and suggesting the poster ping if the patch is uncommented on after a day or two? J _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Keir Fraser
2010-Jun-21 20:33 UTC
Re: [Xen-devel] [PATCH] xencommons: modprobe xenfs if it not be loaded
On 21/06/2010 21:13, "Jeremy Fitzhardinge" <jeremy@goop.org> wrote:>> Should I leave tools patches unapplied for a week, perhaps? > > You mean the policy is that if a patch is not interesting enough to draw > comment, you''ll accept it by default after a week? What about waiting > until there are either positive or negative comments, and suggesting the > poster ping if the patch is uncommented on after a day or two?Well, possibly. I think that will leave a lot of patches unapplied. Perhaps that is for the best, of course. -- Keir _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Yu Zhiguo
2010-Jun-22 01:18 UTC
Re: [Xen-devel] [PATCH] xencommons: mount xenfs directly if xenfs it not be loaded
Hi Jeremy Jeremy Fitzhardinge wrote:>> > > It should just be sufficient to explicitly mount /proc/xen, which will > trigger a modprobe if necessary. > > J >OK, I fixed it, new patch is here. Just deleted check for xenfs support before mount xenfs. ------------------ If xenfs is compiled as a module, now cannot complete ''service xencommons start'', mount xenfs directly can fix it, it can trigger modprobe xenfs. Signed-off-by: Yu Zhiguo <yuzg@cn.fujitsu.com> diff -r bd3bf925f4ce -r 6c8c32876b30 tools/hotplug/Linux/init.d/xencommons --- a/tools/hotplug/Linux/init.d/xencommons Tue Jun 22 17:02:30 2010 +0800 +++ b/tools/hotplug/Linux/init.d/xencommons Tue Jun 22 17:21:44 2010 +0800 @@ -27,7 +27,6 @@ if test "x$1" = xstart && \ test -d /proc/xen && \ ! test -d /proc/xen/capabilities && \ - grep '' xenfs$'' /proc/filesystems >/dev/null && \ ! grep ''^xenfs '' /proc/mounts >/dev/null; then mount -t xenfs xenfs /proc/xen _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Jackson
2010-Jun-22 13:47 UTC
Re: [Xen-devel] [PATCH] xencommons: mount xenfs directly if xenfs it not be loaded
Yu Zhiguo writes ("Re: [Xen-devel] [PATCH] xencommons: mount xenfs directly
if xenfs it not be loaded"):> OK, I fixed it, new patch is here.
> Just deleted check for xenfs support before mount xenfs.
This looks better, thanks.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel