Xen project Mailing List

[Xen-devel] [PATCH 02/17] tools: block-remus: pass uuid to the callback td_open

From: Wen Congyang <wency@xxxxxxxxxxxxxx>

Date: Tue, 14 Oct 2014 10:13:50 +0800

Cc: Ian Campbell <Ian.Campbell@xxxxxxxxxx>, Wen Congyang <wency@xxxxxxxxxxxxxx>, Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>, Jiang Yunhong <yunhong.jiang@xxxxxxxxx>, Dong Eddie <eddie.dong@xxxxxxxxx>, Yang Hongyang <yanghy@xxxxxxxxxxxxxx>, Lai Jiangshan <laijs@xxxxxxxxxxxxxx>

Delivery-date: Tue, 14 Oct 2014 02:13:42 +0000

List-id: Xen developer discussion <xen-devel.lists.xen.org>

remus's callback td_open needs uuid, but it is hard coded as 0. After commit 4b1af8, the vbd's uuid is the minor of the blktap device, not 0. Signed-off-by: Wen Congyang <wency@xxxxxxxxxxxxxx> Acked-by: Shriram Rajagopalan <rshriram@xxxxxxxxx> --- tools/blktap2/drivers/block-aio.c | 3 ++- tools/blktap2/drivers/block-cache.c | 3 ++- tools/blktap2/drivers/block-log.c | 3 ++- tools/blktap2/drivers/block-qcow.c | 3 ++- tools/blktap2/drivers/block-ram.c | 3 ++- tools/blktap2/drivers/block-remus.c | 8 ++------ tools/blktap2/drivers/block-vhd.c | 3 ++- tools/blktap2/drivers/tapdisk-interface.c | 4 +++- tools/blktap2/drivers/tapdisk.h | 2 +- 9 files changed, 18 insertions(+), 14 deletions(-) diff --git a/tools/blktap2/drivers/block-aio.c b/tools/blktap2/drivers/block-aio.c index 10ab20b..1b560e5 100644 --- a/tools/blktap2/drivers/block-aio.c +++ b/tools/blktap2/drivers/block-aio.c @@ -111,7 +111,8 @@ static int tdaio_get_image_info(int fd, td_disk_info_t *info) } /* Open the disk file and initialize aio state. */ -int tdaio_open(td_driver_t *driver, const char *name, td_flag_t flags) +int tdaio_open(td_driver_t *driver, const char *name, td_flag_t flags, + td_uuid_t uuid) { int i, fd, ret, o_flags; struct tdaio_state *prv; diff --git a/tools/blktap2/drivers/block-cache.c b/tools/blktap2/drivers/block-cache.c index 1d2f4eb..cd6ea6a 100644 --- a/tools/blktap2/drivers/block-cache.c +++ b/tools/blktap2/drivers/block-cache.c @@ -517,7 +517,8 @@ block_cache_put_request(block_cache_t *cache, block_cache_request_t *breq) } static int -block_cache_open(td_driver_t *driver, const char *name, td_flag_t flags) +block_cache_open(td_driver_t *driver, const char *name, td_flag_t flags, + td_uuid_t uuid) { int i, err; radix_tree_t *tree; diff --git a/tools/blktap2/drivers/block-log.c b/tools/blktap2/drivers/block-log.c index 5330cdc..7b33b63 100644 --- a/tools/blktap2/drivers/block-log.c +++ b/tools/blktap2/drivers/block-log.c @@ -585,7 +585,8 @@ static void ctl_request(event_id_t id, char mode, void *private) static int tdlog_close(td_driver_t*); -static int tdlog_open(td_driver_t* driver, const char* name, td_flag_t flags) +static int tdlog_open(td_driver_t* driver, const char* name, td_flag_t flags, + td_uuid_t uuid) { struct tdlog_state* s = (struct tdlog_state*)driver->data; int rc; diff --git a/tools/blktap2/drivers/block-qcow.c b/tools/blktap2/drivers/block-qcow.c index b45bcaa..64dfafc 100644 --- a/tools/blktap2/drivers/block-qcow.c +++ b/tools/blktap2/drivers/block-qcow.c @@ -865,7 +865,8 @@ out: } /* Open the disk file and initialize qcow state. */ -int tdqcow_open (td_driver_t *driver, const char *name, td_flag_t flags) +int tdqcow_open (td_driver_t *driver, const char *name, td_flag_t flags, + td_uuid_t uuid) { int fd, len, i, ret, size, o_flags; td_disk_info_t *bs = &(driver->info); diff --git a/tools/blktap2/drivers/block-ram.c b/tools/blktap2/drivers/block-ram.c index a859481..b64a194 100644 --- a/tools/blktap2/drivers/block-ram.c +++ b/tools/blktap2/drivers/block-ram.c @@ -108,7 +108,8 @@ static int get_image_info(int fd, td_disk_info_t *info) } /* Open the disk file and initialize ram state. */ -int tdram_open (td_driver_t *driver, const char *name, td_flag_t flags) +int tdram_open (td_driver_t *driver, const char *name, td_flag_t flags, + td_uuid_t uuid) { char *p; uint64_t size; diff --git a/tools/blktap2/drivers/block-remus.c b/tools/blktap2/drivers/block-remus.c index 079588d..eb8c0ed 100644 --- a/tools/blktap2/drivers/block-remus.c +++ b/tools/blktap2/drivers/block-remus.c @@ -1633,18 +1633,14 @@ static int ctl_register(struct tdremus_state *s) /* interface */ static int tdremus_open(td_driver_t *driver, const char *name, - td_flag_t flags) + td_flag_t flags, td_uuid_t uuid) { struct tdremus_state *s = (struct tdremus_state *)driver->data; int rc; RPRINTF("opening %s\n", name); - /* first we need to get the underlying vbd for this driver stack. To do so we - * need to know the vbd's id. Fortunately, for tapdisk2 this is hard-coded as - * 0 (see tapdisk2.c) - */ - device_vbd = tapdisk_server_get_vbd(0); + device_vbd = tapdisk_server_get_vbd(uuid); memset(s, 0, sizeof(*s)); s->server_fd.fd = -1; diff --git a/tools/blktap2/drivers/block-vhd.c b/tools/blktap2/drivers/block-vhd.c index 76ea5bd..06e9c89 100644 --- a/tools/blktap2/drivers/block-vhd.c +++ b/tools/blktap2/drivers/block-vhd.c @@ -675,7 +675,8 @@ __vhd_open(td_driver_t *driver, const char *name, vhd_flag_t flags) } static int -_vhd_open(td_driver_t *driver, const char *name, td_flag_t flags) +_vhd_open(td_driver_t *driver, const char *name, td_flag_t flags, + td_uuid_t uuid) { vhd_flag_t vhd_flags = 0; diff --git a/tools/blktap2/drivers/tapdisk-interface.c b/tools/blktap2/drivers/tapdisk-interface.c index 2e51883..36b5393 100644 --- a/tools/blktap2/drivers/tapdisk-interface.c +++ b/tools/blktap2/drivers/tapdisk-interface.c @@ -63,6 +63,7 @@ __td_open(td_image_t *image, td_disk_info_t *info) { int err; td_driver_t *driver; + td_vbd_t *vbd = image->private; driver = image->driver; if (!driver) { @@ -78,7 +79,8 @@ __td_open(td_image_t *image, td_disk_info_t *info) } if (!td_flag_test(driver->state, TD_DRIVER_OPEN)) { - err = driver->ops->td_open(driver, image->name, image->flags); + err = driver->ops->td_open(driver, image->name, image->flags, + vbd->uuid); if (err) { if (!image->driver) tapdisk_driver_free(driver); diff --git a/tools/blktap2/drivers/tapdisk.h b/tools/blktap2/drivers/tapdisk.h index 66d508e..459eaec 100644 --- a/tools/blktap2/drivers/tapdisk.h +++ b/tools/blktap2/drivers/tapdisk.h @@ -157,7 +157,7 @@ struct tap_disk { const char *disk_type; td_flag_t flags; int private_data_size; - int (*td_open) (td_driver_t *, const char *, td_flag_t); + int (*td_open) (td_driver_t *, const char *, td_flag_t, td_uuid_t); int (*td_close) (td_driver_t *); int (*td_get_parent_id) (td_driver_t *, td_disk_id_t *); int (*td_validate_parent) (td_driver_t *, td_driver_t *, td_flag_t); -- 1.9.3 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.