OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block: Do not export bdrv_first

Browse Source 
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 <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2010-04-09 15:22:13 +01:00 committed by Kevin Wolf
parent 763b6084ba
commit b66460e4e9
3 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
block-migration.c
View File

@ -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; BlkMigDevState *bmds;
BlockDriverState *bs;
int64_t sectors; 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.submitted = 0;
block_mig_state.read_done = 0; block_mig_state.read_done = 0;
block_mig_state.transferred = 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.total_time = 0;
block_mig_state.reads = 0; block_mig_state.reads = 0;
for (bs = bdrv_first; bs != NULL; bs = bs->next) { bdrv_iterate(init_blk_migration_it, mon);
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);
}
}
} }
static int blk_mig_save_bulked_block(Monitor *mon, QEMUFile *f) static int blk_mig_save_bulked_block(Monitor *mon, QEMUFile *f)

2
block.c
View File

@ -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, static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num,
const uint8_t *buf, int nb_sectors); const uint8_t *buf, int nb_sectors);
BlockDriverState *bdrv_first; static BlockDriverState *bdrv_first;
static BlockDriver *first_drv; static BlockDriver *first_drv;

2
block_int.h
View File

@ -200,8 +200,6 @@ void qemu_aio_release(void *p);
void *qemu_blockalign(BlockDriverState *bs, size_t size); void *qemu_blockalign(BlockDriverState *bs, size_t size);
extern BlockDriverState *bdrv_first;
#ifdef _WIN32 #ifdef _WIN32
int is_windows_drive(const char *filename); int is_windows_drive(const char *filename);
#endif #endif