From 51de97605b183fe5a84f96f411cfc99ba6bbb6b1 Mon Sep 17 00:00:00 2001 From: aliguori Date: Thu, 5 Mar 2009 23:00:43 +0000 Subject: block: Improve bdrv_iterate (Jan Kiszka) Make bdrv_iterate more useful by passing the BlockDriverState to the iterator instead of the device name. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6703 c046a42c-6fe2-441c-8c8c-71466251a162 --- block.c | 4 ++-- block.h | 3 ++- monitor.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 892c47ad81..6bbc389ff0 100644 --- a/block.c +++ b/block.c @@ -1011,12 +1011,12 @@ BlockDriverState *bdrv_find(const char *name) return NULL; } -void bdrv_iterate(void (*it)(void *opaque, const char *name), void *opaque) +void bdrv_iterate(void (*it)(void *opaque, BlockDriverState *bs), void *opaque) { BlockDriverState *bs; for (bs = bdrv_first; bs != NULL; bs = bs->next) { - it(opaque, bs->device_name); + it(opaque, bs); } } diff --git a/block.h b/block.h index e1927dd1d7..aa26ef3982 100644 --- a/block.h +++ b/block.h @@ -141,7 +141,8 @@ void bdrv_set_change_cb(BlockDriverState *bs, void (*change_cb)(void *opaque), void *opaque); void bdrv_get_format(BlockDriverState *bs, char *buf, int buf_size); BlockDriverState *bdrv_find(const char *name); -void bdrv_iterate(void (*it)(void *opaque, const char *name), void *opaque); +void bdrv_iterate(void (*it)(void *opaque, BlockDriverState *bs), + void *opaque); int bdrv_is_encrypted(BlockDriverState *bs); int bdrv_set_key(BlockDriverState *bs, const char *key); void bdrv_iterate_format(void (*it)(void *opaque, const char *name), diff --git a/monitor.c b/monitor.c index 513eca9daa..2d1b86e3c7 100644 --- a/monitor.c +++ b/monitor.c @@ -2679,8 +2679,9 @@ static void file_completion(const char *input) closedir(ffs); } -static void block_completion_it(void *opaque, const char *name) +static void block_completion_it(void *opaque, BlockDriverState *bs) { + const char *name = bdrv_get_device_name(bs); const char *input = opaque; if (input[0] == '\0' || -- cgit v1.2.3