[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 04/19] block: Improve bdrv_iterate
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v2 04/19] block: Improve bdrv_iterate |
Date: |
Sat, 21 Feb 2009 19:29:16 +0100 |
User-agent: |
StGIT/0.14.2 |
Make bdrv_iterate more useful by passing the BlockDriverState to the
iterator instead of the device name.
Signed-off-by: Jan Kiszka <address@hidden>
---
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 330317a..d12a9aa 100644
--- a/block.c
+++ b/block.c
@@ -966,12 +966,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 e1927dd..aa26ef3 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 35f014d..90dbdca 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2648,8 +2648,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' ||
- [Qemu-devel] [PATCH v2 00/19] monitor rework, Jan Kiszka, 2009/02/21
- [Qemu-devel] [PATCH v2 02/19] char-mux: Use separate input buffers, Jan Kiszka, 2009/02/21
- [Qemu-devel] [PATCH v2 04/19] block: Improve bdrv_iterate,
Jan Kiszka <=
- [Qemu-devel] [PATCH v2 06/19] monitor: Use reasonable default virtual console size, Jan Kiszka, 2009/02/21
- [Qemu-devel] [PATCH v2 01/19] char: Fix initial reset, Jan Kiszka, 2009/02/21
- [Qemu-devel] [PATCH v2 03/19] block: Polish error handling of brdv_open2, Jan Kiszka, 2009/02/21
- [Qemu-devel] [PATCH v2 05/19] block: Introduce bdrv_get_encrypted_filename, Jan Kiszka, 2009/02/21
- [Qemu-devel] [PATCH v2 09/19] monitor: Simplify password input mode, Jan Kiszka, 2009/02/21
- [Qemu-devel] [PATCH v2 08/19] monitor: Rework early disk password inquiry, Jan Kiszka, 2009/02/21
- [Qemu-devel] [PATCH v2 07/19] monitor: Report encrypted disks in snapshot mode, Jan Kiszka, 2009/02/21
- [Qemu-devel] [PATCH v2 14/19] monitor: Drop banner hiding, Jan Kiszka, 2009/02/21
- [Qemu-devel] [PATCH v2 11/19] monitor: Rework modal password input, Jan Kiszka, 2009/02/21
- [Qemu-devel] [PATCH v2 19/19] monitor: Pass-through for gdbstub, Jan Kiszka, 2009/02/21