[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/26] block: Do not export bdrv_first
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 17/26] block: Do not export bdrv_first |
Date: |
Fri, 23 Apr 2010 17:30:49 +0200 |
From: Stefan Hajnoczi <address@hidden>
The bdrv_first linked list of BlockDriverStates is currently extern so
that block migration can iterate the list. However, since there is
already a bdrv_iterate() function there is no need to expose bdrv_first.
Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block-migration.c | 63 +++++++++++++++++++++++++++-------------------------
block.c | 2 +-
block_int.h | 2 -
3 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/block-migration.c b/block-migration.c
index 92349a2..7d04d6d 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -230,12 +230,42 @@ static void set_dirty_tracking(int enable)
}
}
-static void init_blk_migration(Monitor *mon, QEMUFile *f)
+static void init_blk_migration_it(void *opaque, BlockDriverState *bs)
{
+ Monitor *mon = opaque;
BlkMigDevState *bmds;
- BlockDriverState *bs;
int64_t sectors;
+ if (bs->type == BDRV_TYPE_HD) {
+ sectors = bdrv_getlength(bs) >> BDRV_SECTOR_BITS;
+ if (sectors == 0) {
+ return;
+ }
+
+ bmds = qemu_mallocz(sizeof(BlkMigDevState));
+ bmds->bs = bs;
+ bmds->bulk_completed = 0;
+ bmds->total_sectors = sectors;
+ bmds->completed_sectors = 0;
+ bmds->shared_base = block_mig_state.shared_base;
+
+ block_mig_state.total_sector_sum += sectors;
+
+ if (bmds->shared_base) {
+ monitor_printf(mon, "Start migration for %s with shared base "
+ "image\n",
+ bs->device_name);
+ } else {
+ monitor_printf(mon, "Start full migration for %s\n",
+ bs->device_name);
+ }
+
+ QSIMPLEQ_INSERT_TAIL(&block_mig_state.bmds_list, bmds, entry);
+ }
+}
+
+static void init_blk_migration(Monitor *mon, QEMUFile *f)
+{
block_mig_state.submitted = 0;
block_mig_state.read_done = 0;
block_mig_state.transferred = 0;
@@ -245,34 +275,7 @@ static void init_blk_migration(Monitor *mon, QEMUFile *f)
block_mig_state.total_time = 0;
block_mig_state.reads = 0;
- for (bs = bdrv_first; bs != NULL; bs = bs->next) {
- if (bs->type == BDRV_TYPE_HD) {
- sectors = bdrv_getlength(bs) >> BDRV_SECTOR_BITS;
- if (sectors == 0) {
- continue;
- }
-
- bmds = qemu_mallocz(sizeof(BlkMigDevState));
- bmds->bs = bs;
- bmds->bulk_completed = 0;
- bmds->total_sectors = sectors;
- bmds->completed_sectors = 0;
- bmds->shared_base = block_mig_state.shared_base;
-
- block_mig_state.total_sector_sum += sectors;
-
- if (bmds->shared_base) {
- monitor_printf(mon, "Start migration for %s with shared base "
- "image\n",
- bs->device_name);
- } else {
- monitor_printf(mon, "Start full migration for %s\n",
- bs->device_name);
- }
-
- QSIMPLEQ_INSERT_TAIL(&block_mig_state.bmds_list, bmds, entry);
- }
- }
+ bdrv_iterate(init_blk_migration_it, mon);
}
static int blk_mig_save_bulked_block(Monitor *mon, QEMUFile *f)
diff --git a/block.c b/block.c
index ed4c819..61da183 100644
--- a/block.c
+++ b/block.c
@@ -55,7 +55,7 @@ static int bdrv_read_em(BlockDriverState *bs, int64_t
sector_num,
static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num,
const uint8_t *buf, int nb_sectors);
-BlockDriverState *bdrv_first;
+static BlockDriverState *bdrv_first;
static BlockDriver *first_drv;
diff --git a/block_int.h b/block_int.h
index e7e1e7e..d5a808d 100644
--- a/block_int.h
+++ b/block_int.h
@@ -200,8 +200,6 @@ void qemu_aio_release(void *p);
void *qemu_blockalign(BlockDriverState *bs, size_t size);
-extern BlockDriverState *bdrv_first;
-
#ifdef _WIN32
int is_windows_drive(const char *filename);
#endif
--
1.6.6.1
- [Qemu-devel] [PATCH 06/26] blkdebug: Add events and rules, (continued)
- [Qemu-devel] [PATCH 06/26] blkdebug: Add events and rules, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 08/26] qcow2: Fix creation of large images, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 09/26] Replace calls of old bdrv_open, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 13/26] qcow2: Fix error return code in qcow2_alloc_cluster_link_l2, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 10/26] block: get rid of the BDRV_O_FILE flag, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 12/26] qcow2: Return 0/-errno in write_l2_entries, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 07/26] qcow2: Trigger blkdebug events, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 11/26] block: split raw_getlength, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 15/26] qcow2: Return 0/-errno in l2_allocate, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 14/26] qcow2: Return 0/-errno in write_l1_entry, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 17/26] block: Do not export bdrv_first,
Kevin Wolf <=
- [Qemu-devel] [PATCH 16/26] cleanup block driver option handling in vl.c, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 18/26] block: Convert bdrv_first to QTAILQ, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 21/26] block: Convert first_drv to QLIST, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 19/26] Remove un-needed code, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 20/26] block.h: bdrv_create2 doesn't exist any more, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 22/26] qemu-img: Eliminate bdrv_new_open() code duplication, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 23/26] qemu-img: Fix BRDV_O_FLAGS typo, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 24/26] linux-aio: Fix typo in read() EINTR check, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 25/26] qcow2: Use QLIST_FOREACH_SAFE macro, Kevin Wolf, 2010/04/23
- [Qemu-devel] [PATCH 26/26] block: Free iovec arrays allocated by multiwrite_merge(), Kevin Wolf, 2010/04/23