[Xen-changelog] [xen-4.1-testing] libxl: revert 23428:93e17b0cd035 "avoid blktap2 deadlock"

[Xen patchbot-4.1-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
# Date 1355745292 0
# Node ID 516dbd9deb4f2c96b9d6d6c352ca261bb2796eda
# Parent  93e17b0cd035bf2fd43c8d14931556c6b35b66cb
libxl: revert 23428:93e17b0cd035 "avoid blktap2 deadlock"

This results in additional leakage in xenstore according to the
automated tests.

Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r 93e17b0cd035 -r 516dbd9deb4f tools/libxl/libxl_blktap2.c
--- a/tools/libxl/libxl_blktap2.c       Thu Dec 13 14:35:58 2012 +0000
+++ b/tools/libxl/libxl_blktap2.c       Mon Dec 17 11:54:52 2012 +0000
@@ -59,7 +59,6 @@ void libxl__device_destroy_tapdisk(libxl
     char *path, *params, *type, *disk;
     int err;
     tap_list_t tap;
-    libxl_ctx *ctx = libxl__gc_owner(gc);
 
     path = libxl__sprintf(gc, "%s/tapdisk-params", be_path);
     if (!path) return;
@@ -76,11 +75,5 @@ void libxl__device_destroy_tapdisk(libxl
     err = tap_ctl_find(type, disk, &tap);
     if (err < 0) return;
 
-    /*
-     * Remove the instance of the backend device to avoid a deadlock with the
-     * removal of the tap device.
-     */
-    xs_rm(ctx->xsh, XBT_NULL, be_path);
-
     tap_ctl_destroy(tap.id, tap.minor);
 }
diff -r 93e17b0cd035 -r 516dbd9deb4f tools/libxl/libxl_device.c
--- a/tools/libxl/libxl_device.c        Thu Dec 13 14:35:58 2012 +0000
+++ b/tools/libxl/libxl_device.c        Mon Dec 17 11:54:52 2012 +0000
@@ -251,6 +251,7 @@ int libxl__device_destroy(libxl_ctx *ctx
         goto out;
     if (atoi(state) != 4) {
         libxl__device_destroy_tapdisk(&gc, be_path);
+        xs_rm(ctx->xsh, XBT_NULL, be_path);
         goto out;
     }
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog