diff options
author | Roger Pau Monne <roger.pau@citrix.com> | 2013-09-06 12:36:26 +0200 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2013-09-13 13:13:31 +0100 |
commit | a508caf0ebc4f834bd44c1d607e5b7bfabe43e3d (patch) | |
tree | f9b540ea976c6a305096b7f259cf841f956f9f14 /tools/libxl | |
parent | 1438d36f96e90d1116bebc6b3013634ca21c49c8 (diff) | |
download | xen-a508caf0ebc4f834bd44c1d607e5b7bfabe43e3d.tar.gz xen-a508caf0ebc4f834bd44c1d607e5b7bfabe43e3d.tar.bz2 xen-a508caf0ebc4f834bd44c1d607e5b7bfabe43e3d.zip |
libxl: fix libxl__device_disk_from_xs_be to parse backend domid
libxl__device_disk_from_xs_be was ignoring the backend domid, setting
it to 0 by default. Fix this by parsing the backend disk path in order
to fetch the backend domid.
This fixes the issue reported when trying to block-detach disks that
have it's backend on a driver domain.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reported-by: G.R. <firemeteor@users.sourceforge.net>
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools/libxl')
-rw-r--r-- | tools/libxl/libxl.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 1bce4bb46f..7a7aaf90fe 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2234,9 +2234,16 @@ static int libxl__device_disk_from_xs_be(libxl__gc *gc, libxl_ctx *ctx = libxl__gc_owner(gc); unsigned int len; char *tmp; + int rc; libxl_device_disk_init(disk); + rc = sscanf(be_path, "/local/domain/%d/", &disk->backend_domid); + if (rc != 1) { + LOG(ERROR, "Unable to fetch device backend domid from %s", be_path); + goto cleanup; + } + /* "params" may not be present; but everything else must be. */ tmp = xs_read(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "%s/params", be_path), &len); |