xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Roger Pau Monne <roger.pau@citrix.com>
To: xen-devel@lists.xen.org
Cc: Ian Jackson <ian.jackson@eu.citrix.com>,
	Roger Pau Monne <roger.pau@citrix.com>
Subject: [PATCH v7 05/15] libxl: refactor disk addition to take a helper
Date: Wed, 4 Jul 2012 11:16:02 +0100	[thread overview]
Message-ID: <1341396972-49704-5-git-send-email-roger.pau@citrix.com> (raw)
In-Reply-To: <1341396972-49704-1-git-send-email-roger.pau@citrix.com>

Change libxl__device_disk_add to no longer take a xs transaction and
instead pass a helper for the local attach case that's used to get the
free vdev.

Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
 tools/libxl/libxl.c          |   80 ++++++++++++++++++++++++++---------------
 tools/libxl/libxl_internal.h |    2 +-
 2 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 7e6d5c9..10176f0 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -1733,15 +1733,23 @@ int libxl__device_from_disk(libxl__gc *gc, uint32_t domid,
     return 0;
 }
 
-int libxl__device_disk_add(libxl__gc *gc, uint32_t domid,
-        xs_transaction_t t, libxl_device_disk *disk)
+/* Specific function called directly only by local disk attach,
+ * all other users should instead use the regular
+ * libxl__device_disk_add wrapper
+ */
+static int device_disk_add(libxl__gc *gc, uint32_t domid,
+                           libxl_device_disk *disk,
+                           char *(*fn)(libxl__gc *, const char *,
+                                              xs_transaction_t),
+                           const char *blkdev_start)
 {
     flexarray_t *front;
     flexarray_t *back;
     char *dev;
     libxl__device device;
-    int major, minor, rc;
+    int major, minor, rc, xs_ret;
     libxl_ctx *ctx = gc->owner;
+    xs_transaction_t t = XBT_NULL;
 
     rc = libxl__device_disk_setdefault(gc, disk);
     if (rc) goto out;
@@ -1839,9 +1847,33 @@ int libxl__device_disk_add(libxl__gc *gc, uint32_t domid,
     flexarray_append(front, "device-type");
     flexarray_append(front, disk->is_cdrom ? "cdrom" : "disk");
 
-    libxl__device_generic_add(gc, t, &device,
-                             libxl__xs_kvs_of_flexarray(gc, back, back->count),
-                             libxl__xs_kvs_of_flexarray(gc, front, front->count));
+    do {
+        t = xs_transaction_start(ctx->xsh);
+        if (t == XBT_NULL) {
+            LOG(ERROR, "failed to start a xenstore transaction");
+            rc = ERROR_FAIL;
+            goto out_free;
+        }
+        if (fn) {
+            assert(blkdev_start);
+            disk->vdev = fn(gc, blkdev_start, t);
+            if (disk->vdev == NULL) {
+                LOG(ERROR, "libxl__alloc_vdev failed");
+                rc = ERROR_FAIL;
+                goto out_free;
+            }
+        }
+        libxl__device_generic_add(gc, t, &device,
+                        libxl__xs_kvs_of_flexarray(gc, back, back->count),
+                        libxl__xs_kvs_of_flexarray(gc, front, front->count));
+        xs_ret = xs_transaction_end(ctx->xsh, t, 0);
+    } while (xs_ret == 0 && errno == EAGAIN);
+    t = XBT_NULL;
+    if (xs_ret == 0) {
+        LOGE(ERROR, "xenstore transaction failed");
+        rc = ERROR_FAIL;
+        goto out_free;
+    }
 
     rc = 0;
 
@@ -1849,13 +1881,21 @@ out_free:
     flexarray_free(back);
     flexarray_free(front);
 out:
+    if (t != XBT_NULL)
+        xs_transaction_end(ctx->xsh, t, 0);
     return rc;
 }
 
+int libxl__device_disk_add(libxl__gc *gc, uint32_t domid,
+                           libxl_device_disk *disk)
+{
+    return device_disk_add(gc, domid, disk, NULL, NULL);
+}
+
 int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk)
 {
     GC_INIT(ctx);
-    int rc = libxl__device_disk_add(gc, domid, XBT_NULL, disk);
+    int rc = libxl__device_disk_add(gc, domid, disk);
     GC_FREE;
     return rc;
 }
@@ -2113,7 +2153,7 @@ char * libxl__device_disk_local_attach(libxl__gc *gc,
     libxl_ctx *ctx = gc->owner;
     char *dev = NULL, *be_path = NULL;
     char *ret = NULL;
-    int rc, xs_ret;
+    int rc;
     libxl__device device;
     xs_transaction_t t = XBT_NULL;
 
@@ -2159,27 +2199,9 @@ char * libxl__device_disk_local_attach(libxl__gc *gc,
             break;
         case LIBXL_DISK_BACKEND_QDISK:
             if (disk->format != LIBXL_DISK_FORMAT_RAW) {
-                do {
-                    t = xs_transaction_start(ctx->xsh);
-                    if (t == XBT_NULL) {
-                        LOG(ERROR, "failed to start a xenstore transaction");
-                        goto out;
-                    }
-                    disk->vdev = libxl__alloc_vdev(gc, blkdev_start, t);
-                    if (disk->vdev == NULL) {
-                        LOG(ERROR, "libxl__alloc_vdev failed");
-                        goto out;
-                    }
-                    if (libxl__device_disk_add(gc, LIBXL_TOOLSTACK_DOMID,
-                                t, disk)) {
-                        LOG(ERROR, "libxl_device_disk_add failed");
-                        goto out;
-                    }
-                    xs_ret = xs_transaction_end(ctx->xsh, t, 0);
-                } while (xs_ret == 0 && errno == EAGAIN);
-                t = XBT_NULL;
-                if (xs_ret == 0) {
-                    LOGE(ERROR, "xenstore transaction failed");
+                if (device_disk_add(gc, LIBXL_TOOLSTACK_DOMID, disk,
+                                    libxl__alloc_vdev, blkdev_start)) {
+                    LOG(ERROR, "libxl_device_disk_add failed");
                     goto out;
                 }
                 dev = GCSPRINTF("/dev/%s", disk->vdev);
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 7a75809..1befdc5 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1291,7 +1291,7 @@ _hidden int libxl__device_from_disk(libxl__gc *gc, uint32_t domid,
                                    libxl_device_disk *disk,
                                    libxl__device *device);
 _hidden int libxl__device_disk_add(libxl__gc *gc, uint32_t domid,
-        xs_transaction_t t, libxl_device_disk *disk);
+                                   libxl_device_disk *disk);
 
 /*
  * Make a disk available in this (the control) domain. Returns path to
-- 
1.7.7.5 (Apple Git-26)

  parent reply	other threads:[~2012-07-04 10:16 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-04 10:15 [PATCH v7 01/15] libxl: change ao_device_remove to ao_device Roger Pau Monne
2012-07-04 10:15 ` [PATCH v7 02/15] libxl: move device model creation prototypes Roger Pau Monne
2012-07-04 10:16 ` [PATCH v7 03/15] libxl: convert libxl_domain_destroy to an async op Roger Pau Monne
2012-07-04 10:16 ` [PATCH v7 04/15] libxl: move bootloader data strucutres and prototypes Roger Pau Monne
2012-07-04 10:16 ` Roger Pau Monne [this message]
2012-07-04 10:16 ` [PATCH v7 06/15] libxl: convert libxl__device_disk_local_attach to an async op Roger Pau Monne
2012-07-04 10:16 ` [PATCH v7 07/15] libxl: rename vifs to nics Roger Pau Monne
2012-07-04 10:16 ` [PATCH v7 08/15] libxl: convert libxl_device_disk_add to an async op Roger Pau Monne
2012-07-04 10:16 ` [PATCH v7 09/15] libxl: convert libxl_device_nic_add to an async operation Roger Pau Monne
2012-07-04 10:16 ` [PATCH v7 10/15] libxl: add option to choose who executes hotplug scripts Roger Pau Monne
2012-07-04 10:16 ` [PATCH v7 11/15] libxl: rename _IOEMU nic type to VIF_IOEMU Roger Pau Monne
2012-07-04 10:16 ` [PATCH v7 12/15] libxl: set correct nic type depending on the guest Roger Pau Monne
2012-07-04 10:16 ` [PATCH v7 13/15] libxl: use libxl__xs_path_cleanup on device_destroy Roger Pau Monne
2012-07-04 10:16 ` [PATCH v7 14/15] libxl: call hotplug scripts for disk devices from libxl Roger Pau Monne
2012-07-04 10:16 ` [PATCH v7 15/15] libxl: call hotplug scripts for nic " Roger Pau Monne

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1341396972-49704-5-git-send-email-roger.pau@citrix.com \
    --to=roger.pau@citrix.com \
    --cc=ian.jackson@eu.citrix.com \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).