Re: [Xen-devel] [xen-unstable test] 13389: regressions - FAIL

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Fri, 2012-06-29 at 04:39 +0100, xen.org wrote:
>  test-i386-i386-xl-qemuu-winxpsp3  9 guest-localmigrate    fail REGR. vs. 
> 13379

        migration target: Ready to receive domain.
        Saving to migration stream new xl format (info 0x0/0x0/661)
        Loading new save file <incoming migration stream> (new xl fmt info 
0x0/0x0/661)
         Savefile contains xl domain config
        WARNING: ignoring "kernel" directive for HVM guest. Use 
"firmware_override" instead if you really want a non-default firmware
        xl: libxl_xshelp.c:174: libxl__xs_transaction_start: Assertion `!*t' 
failed.

8<---------------------------------------------------------

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1340954225 -3600
# Node ID 75c5ca9f6111226c06fc5da8071b160b6ac7904b
# Parent  c5b08c577c7fba45724f4a0f84abf576c6299b9c
libxl: libxl__xs_transaction_commit should always clear the transaction.

This includes the EAGAIN case.

Users are of the form:

   xs_transaction_t t = 0;

   for (;;) {
        rc = libxl__xs_transaction_start(gc, &t);

        rc = stuff
        if (rc) goto out;
        ...more...

        rc = libxl__xs_transaction_commit(gc, &t);
        if (!rc) break;
        if (rc<0) goto out;
    }
  ...
 out:

So in EAGAIN (commit -> +1) we will go round the loop again and call start
which leads to:
    xl: libxl_xshelp.c:174: libxl__xs_transaction_start: Assertion `!*t' failed.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

diff -r c5b08c577c7f -r 75c5ca9f6111 tools/libxl/libxl_xshelp.c
--- a/tools/libxl/libxl_xshelp.c        Fri Jun 29 08:05:09 2012 +0100
+++ b/tools/libxl/libxl_xshelp.c        Fri Jun 29 08:17:05 2012 +0100
@@ -185,10 +185,10 @@ int libxl__xs_transaction_commit(libxl__
     assert(*t);
 
     if (!xs_transaction_end(CTX->xsh, *t, 0)) {
+        *t = 0;
         if (errno == EAGAIN)
             return +1;
 
-        *t = 0;
         LOGE(ERROR, "could not commit xenstore transaction");
         return ERROR_FAIL;
     }



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