Re: [Xen-devel] [PATCH] [Reminder] Xendomains was not correctly suspending domains when a STOP was issued.

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

It's in my queue. I don't know if it will make rc6 but it'll get in.

On Wed, 2013-06-26 at 22:41 +0100, Ian Murray wrote:
> I was under the impression that this in line for 4.3 RC6 but as of yet, 
> I am not seeing it in git. Maybe it's queued, in which case ignore this 
> or if it's been forgotten, then please don't ignore this. :)
> 
> Thanks,
> 
> Ian
> 
> 
> 
> On 22/06/13 13:38, Ian Murray wrote:
> > The regex was not selecting the { when parsing JSON output of xl list -l.
> > It was also not selecting (domain when parsing xl list -l when SXP selected.
> >
> > Pefixed { with 4 spaces, and removed an extra ( before domain in the regex
> > string
> >
> > Added quotes around the grep strings so the spaces inserted into the string
> > didn't not break the grepping.
> >
> > This has now been tested against 4.3RC5
> >
> > Signed-off-by: Ian Murray <murrayie@xxxxxxxxxxx>
> > ---
> >   tools/hotplug/Linux/init.d/xendomains |   10 +++++-----
> >   1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/tools/hotplug/Linux/init.d/xendomains 
> > b/tools/hotplug/Linux/init.d/xendomains
> > index 730541e..38371af 100644
> > --- a/tools/hotplug/Linux/init.d/xendomains
> > +++ b/tools/hotplug/Linux/init.d/xendomains
> > @@ -206,7 +206,7 @@ rdnames()
> >       done
> >   }
> >   
> > -LIST_GREP='((domain\|(domid\|(name\|^{$\|"name":\|"domid":'
> > +LIST_GREP='(domain\|(domid\|(name\|^    {$\|"name":\|"domid":'
> >   parseln()
> >   {
> >       if [[ "$1" =~ '(domain' ]] || [[ "$1" = "{" ]]; then
> > @@ -237,7 +237,7 @@ is_running()
> >             RC=0
> >             ;;
> >     esac
> > -    done < <($CMD list -l | grep $LIST_GREP)
> > +    done < <($CMD list -l | grep "$LIST_GREP")
> >       return $RC
> >   }
> >   
> > @@ -319,7 +319,7 @@ all_zombies()
> >     if test "$state" != "-b---d" -a "$state" != "-----d"; then
> >         return 1;
> >     fi
> > -    done < <($CMD list -l | grep $LIST_GREP)
> > +    done < <($CMD list -l | grep "$LIST_GREP")
> >       return 0
> >   }
> >   
> > @@ -450,7 +450,7 @@ stop()
> >         fi
> >         kill $WDOG_PID >/dev/null 2>&1
> >     fi
> > -    done < <($CMD list -l | grep $LIST_GREP)
> > +    done < <($CMD list -l | grep "$LIST_GREP")
> >   
> >       # NB. this shuts down ALL Xen domains (politely), not just the ones in
> >       # AUTODIR/*
> > @@ -487,7 +487,7 @@ check_domain_up()
> >             return 0
> >             ;;
> >     esac
> > -    done < <($CMD list -l | grep $LIST_GREP)
> > +    done < <($CMD list -l | grep "$LIST_GREP")
> >       return 1
> >   }
> >   
> 



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel