From a508caf0ebc4f834bd44c1d607e5b7bfabe43e3d Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Fri, 6 Sep 2013 12:36:26 +0200 Subject: libxl: fix libxl__device_disk_from_xs_be to parse backend domid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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é Reported-by: G.R. Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tools/libxl') 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); -- cgit v1.2.3