From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH v8 09/11] libxl__device_disk_local_attach: wait for state "connected" Date: Tue, 29 May 2012 11:39:14 +0100 Message-ID: <1338287956-24691-9-git-send-email-stefano.stabellini@eu.citrix.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xensource.com Cc: Ian.Jackson@eu.citrix.com, Ian.Campbell@citrix.com, Stefano Stabellini List-Id: xen-devel@lists.xenproject.org In order to make sure that the block device is available and ready to be used, wait for state "connected" in the backend before returning. Signed-off-by: Stefano Stabellini Changes in v5: - unify error paths. Changes in v4: - improve exit paths. Signed-off-by: Stefano Stabellini Acked-by: Ian Jackson --- tools/libxl/libxl.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 223ae40..626abde 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1781,9 +1781,10 @@ char * libxl__device_disk_local_attach(libxl__gc *gc, const char *blkdev_start) { libxl_ctx *ctx = gc->owner; - char *dev = NULL; + char *dev = NULL, *be_path = NULL; char *ret = NULL; int rc, xs_ret; + libxl__device device; xs_transaction_t t = XBT_NULL; if (in_disk->pdev_path == NULL) @@ -1863,12 +1864,25 @@ char * libxl__device_disk_local_attach(libxl__gc *gc, break; } - out: - if (t != XBT_NULL) - xs_transaction_end(ctx->xsh, t, 1); + if (disk->vdev != NULL) { + rc = libxl__device_from_disk(gc, LIBXL_TOOLSTACK_DOMID, disk, &device); + if (rc < 0) + goto out; + be_path = libxl__device_backend_path(gc, &device); + rc = libxl__wait_for_backend(gc, be_path, "4"); + if (rc < 0) + goto out; + } if (dev != NULL) ret = strdup(dev); return ret; + + out: + if (t != XBT_NULL) + xs_transaction_end(ctx->xsh, t, 1); + else + libxl__device_disk_local_detach(gc, disk); + return NULL; } int libxl__device_disk_local_detach(libxl__gc *gc, libxl_device_disk *disk) -- 1.7.2.5