[PATCH] tools/libxl: Do not use remus teardown paths for non-remus guests

[PATCH] tools/libxl: Do not use remus teardown paths for non-remus guests

[Andrew Cooper]

It causes a suspend failure to emit

  libxl: error: libxl_dom.c:2035:remus_teardown_done: Remus: failed to
  teardown device for guest with domid 17, rc -3

for all domains, including those not using remus at all.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
---
 tools/libxl/libxl_dom.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
index 48d661a..a16d4a1 100644
--- a/tools/libxl/libxl_dom.c
+++ b/tools/libxl/libxl_dom.c
@@ -2007,7 +2007,7 @@ static void domain_suspend_done(libxl__egc *egc,
                            dss->guest_evtchn.port, &dss->guest_evtchn_lockfd);
 
     if (!dss->remus) {
-        remus_teardown_done(egc, &dss->rds, rc);
+        dss->callback(egc, dss, rc);
         return;
     }
 
-- 
1.7.10.4

Re: [PATCH] tools/libxl: Do not use remus teardown paths for non-remus guests

[Ian Campbell]

On Thu, 2015-02-19 at 12:43 +0000, Andrew Cooper wrote:
> It causes a suspend failure to emit
> 
>   libxl: error: libxl_dom.c:2035:remus_teardown_done: Remus: failed to
>   teardown device for guest with domid 17, rc -3
> 
> for all domains, including those not using remus at all.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> CC: Ian Campbell <Ian.Campbell@citrix.com>
> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
> CC: Wei Liu <wei.liu2@citrix.com>
> ---
>  tools/libxl/libxl_dom.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
> index 48d661a..a16d4a1 100644
> --- a/tools/libxl/libxl_dom.c
> +++ b/tools/libxl/libxl_dom.c
> @@ -2007,7 +2007,7 @@ static void domain_suspend_done(libxl__egc *egc,
>                             dss->guest_evtchn.port, &dss->guest_evtchn_lockfd);
>  
>      if (!dss->remus) {
> -        remus_teardown_done(egc, &dss->rds, rc);
> +        dss->callback(egc, dss, rc);

This no longer logs the rc (although the wording was wrong confusing
before). I think it needs probably to log something about the suspend
having failed if rc is set. Ian?

>          return;
>      }
>  

Re: [PATCH] tools/libxl: Do not use remus teardown paths for non-remus guests

[Ian Campbell]

On Thu, 2015-02-19 at 16:44 +0000, Ian Campbell wrote:
> On Thu, 2015-02-19 at 12:43 +0000, Andrew Cooper wrote:
> > It causes a suspend failure to emit
> > 
> >   libxl: error: libxl_dom.c:2035:remus_teardown_done: Remus: failed to
> >   teardown device for guest with domid 17, rc -3
> > 
> > for all domains, including those not using remus at all.
> > 
> > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> > CC: Ian Campbell <Ian.Campbell@citrix.com>
> > CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
> > CC: Wei Liu <wei.liu2@citrix.com>
> > ---
> >  tools/libxl/libxl_dom.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
> > index 48d661a..a16d4a1 100644
> > --- a/tools/libxl/libxl_dom.c
> > +++ b/tools/libxl/libxl_dom.c
> > @@ -2007,7 +2007,7 @@ static void domain_suspend_done(libxl__egc *egc,
> >                             dss->guest_evtchn.port, &dss->guest_evtchn_lockfd);
> >  
> >      if (!dss->remus) {
> > -        remus_teardown_done(egc, &dss->rds, rc);
> > +        dss->callback(egc, dss, rc);
> 
> This no longer logs the rc (although the wording was wrong confusing
> before). I think it needs probably to log something about the suspend
> having failed if rc is set. Ian?

Ian said on IRC:
        I don't think it needs to log. Having looked at the patch but
        not the context it seems like a probably-right change which
        should be backported.

So: Acked-by: Ian Campbell <ian.campbell@citrix.com>
and applied, thanks.

> 
> >          return;
> >      }
> >  
>