From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH v4 8/8] libxl__device_disk_local_attach: wait for state "connected" Date: Tue, 24 Apr 2012 11:45:58 +0100 Message-ID: <1335264358-20182-8-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 v4: - improve exit paths. Signed-off-by: Stefano Stabellini --- tools/libxl/libxl_internal.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index bb75491..98a67d6 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -508,8 +508,9 @@ _hidden char * libxl__device_disk_local_attach(libxl__gc *gc, char *blkdev_start) { libxl_ctx *ctx = gc->owner; - char *dev = NULL; + char *dev = NULL, *be_path = NULL; int rc; + libxl__device device; xs_transaction_t t = XBT_NULL; libxl_device_disk *tmpdisk = libxl__zalloc(gc, sizeof(libxl_device_disk)); if (tmpdisk == NULL) goto out; @@ -596,10 +597,23 @@ _hidden char * libxl__device_disk_local_attach(libxl__gc *gc, break; } + if (tmpdisk->vdev != NULL) { + rc = libxl__device_from_disk(gc, 0, tmpdisk, &device); + if (rc < 0) + goto out_wait_err; + be_path = libxl__device_backend_path(gc, &device); + rc = libxl__wait_for_backend(gc, be_path, "4"); + if (rc < 0) + goto out_wait_err; + } + out: if (t != XBT_NULL) xs_transaction_end(ctx->xsh, t, 1); return dev; + out_wait_err: + libxl__device_disk_local_detach(gc, tmpdisk); + return NULL; } _hidden int libxl__device_disk_local_detach(libxl__gc *gc, libxl_device_disk *disk) -- 1.7.2.5