From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: xen-devel@lists.xensource.com
Cc: Ian.Jackson@eu.citrix.com, Ian.Campbell@citrix.com,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: [PATCH 4/6] libxl: introduce libxl__device_disk_add_t
Date: Tue, 27 Mar 2012 14:59:30 +0100 [thread overview]
Message-ID: <1332856772-30292-4-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1203271453390.15151@kaball-desktop>
Introduce libxl__device_disk_add_t that takes an additional
xs_transaction_t paramter.
Implement libxl_device_disk_add using libxl__device_disk_add_t.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
tools/libxl/libxl.c | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index ce5e7be..fe63fd5 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -1278,14 +1278,16 @@ static int libxl__device_from_disk(libxl__gc *gc, uint32_t domid,
return 0;
}
-int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk)
+
+static int libxl__device_disk_add_t(libxl__gc *gc, uint32_t domid, xs_transaction_t t,
+ libxl_device_disk *disk)
{
- GC_INIT(ctx);
flexarray_t *front;
flexarray_t *back;
char *dev;
libxl__device device;
int major, minor, rc;
+ libxl_ctx *ctx = gc->owner;
rc = libxl__device_disk_setdefault(gc, disk);
if (rc) goto out;
@@ -1381,9 +1383,9 @@ int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *dis
flexarray_append(front, "device-type");
flexarray_append(front, disk->is_cdrom ? "cdrom" : "disk");
- libxl__device_generic_add(gc, &device,
- libxl__xs_kvs_of_flexarray(gc, back, back->count),
- libxl__xs_kvs_of_flexarray(gc, front, front->count));
+ libxl__device_generic_add_t(gc, t, &device,
+ libxl__xs_kvs_of_flexarray(gc, back, back->count),
+ libxl__xs_kvs_of_flexarray(gc, front, front->count));
rc = 0;
@@ -1391,6 +1393,13 @@ out_free:
flexarray_free(back);
flexarray_free(front);
out:
+ return rc;
+}
+
+int libxl_device_disk_add(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk)
+{
+ GC_INIT(ctx);
+ int rc = libxl__device_disk_add_t(gc, domid, XBT_NULL, disk);
GC_FREE;
return rc;
}
--
1.7.2.5
next prev parent reply other threads:[~2012-03-27 13:59 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-27 13:58 [PATCH 0/6] qdisk local attach Stefano Stabellini
2012-03-27 13:59 ` [PATCH 1/6] libxl: libxl_device_disk_local_attach return a new libxl_device_disk Stefano Stabellini
2012-03-27 14:07 ` Ian Campbell
2012-03-30 10:42 ` Stefano Stabellini
2012-03-27 16:21 ` Ian Jackson
2012-03-30 10:43 ` Stefano Stabellini
2012-03-27 13:59 ` [PATCH 2/6] libxl: introduce libxl__device_generic_add_t Stefano Stabellini
2012-03-27 14:04 ` Ian Campbell
2012-03-30 10:44 ` Stefano Stabellini
2012-03-27 16:50 ` Ian Jackson
2012-03-30 10:46 ` Stefano Stabellini
2012-04-02 16:18 ` Ian Jackson
2012-04-03 12:03 ` Stefano Stabellini
2012-03-27 13:59 ` [PATCH 3/6] libxl: add an xs_transaction_t parameter to two libxl functions Stefano Stabellini
2012-03-27 14:17 ` Ian Campbell
2012-03-27 16:50 ` Ian Jackson
2012-03-27 13:59 ` Stefano Stabellini [this message]
2012-03-27 13:59 ` [PATCH 5/6] libxl: introduce libxl__alloc_vdev Stefano Stabellini
2012-03-27 14:21 ` Ian Campbell
2012-03-27 17:21 ` Ian Jackson
2012-03-30 11:43 ` Stefano Stabellini
2012-03-30 12:14 ` Ian Campbell
2012-03-30 12:57 ` Stefano Stabellini
2012-03-27 17:19 ` Ian Jackson
2012-03-30 11:57 ` Stefano Stabellini
2012-03-30 14:17 ` Ian Jackson
2012-03-30 15:23 ` Stefano Stabellini
2012-04-02 16:15 ` Ian Jackson
2012-04-03 13:15 ` Stefano Stabellini
2012-04-03 13:17 ` Ian Jackson
2012-04-03 14:19 ` Stefano Stabellini
2012-04-03 14:24 ` Ian Jackson
2012-04-10 17:37 ` Stefano Stabellini
2012-04-11 15:49 ` Stefano Stabellini
2012-03-27 13:59 ` [PATCH 6/6] xl/libxl: implement QDISK libxl_device_disk_local_attach Stefano Stabellini
2012-03-27 17:20 ` Ian Jackson
2012-03-30 10:50 ` Stefano Stabellini
2012-03-30 13:47 ` Ian Jackson
2012-03-30 14:55 ` Stefano Stabellini
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=1332856772-30292-4-git-send-email-stefano.stabellini@eu.citrix.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=Ian.Campbell@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=xen-devel@lists.xensource.com \
/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).