Commit 8591675f authored Jan 26, 2011 by Marcelo Tosatti Committed by Kevin Wolf Feb 07, 2011

block: enable in_use flag



Set block device in use during block migration, disallow drive_del and
bdrv_truncate for in use devices.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

parent db593f25

block-migration.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -301,6 +301,7 @@ static void init_blk_migration_it(void opaque, BlockDriverState bs)
		bmds->shared_base = block_mig_state.shared_base;
		alloc_aio_bitmap(bmds);
		drive_get_ref(drive_get_by_blockdev(bs));
		bdrv_set_in_use(bs, 1);

		block_mig_state.total_sector_sum += sectors;

		@@ -539,6 +540,7 @@ static void blk_mig_cleanup(Monitor *mon)

		while ((bmds = QSIMPLEQ_FIRST(&block_mig_state.bmds_list)) != NULL) {
		QSIMPLEQ_REMOVE_HEAD(&block_mig_state.bmds_list, entry);
		bdrv_set_in_use(bmds->bs, 0);
		drive_put_ref(drive_get_by_blockdev(bmds->bs));
		qemu_free(bmds->aio_bitmap);
		qemu_free(bmds);

block.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1132,6 +1132,8 @@ int bdrv_truncate(BlockDriverState *bs, int64_t offset)
		return -ENOTSUP;
		if (bs->read_only)
		return -EACCES;
		if (bdrv_in_use(bs))
		return -EBUSY;
		ret = drv->bdrv_truncate(bs, offset);
		if (ret == 0) {
		ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);

blockdev.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -726,6 +726,10 @@ int do_drive_del(Monitor mon, const QDict qdict, QObject **ret_data)
		qerror_report(QERR_DEVICE_NOT_FOUND, id);
		return -1;
		}
		if (bdrv_in_use(bs)) {
		qerror_report(QERR_DEVICE_IN_USE, id);
		return -1;
		}

		/* quiesce block driver; prevent further io */
		qemu_aio_flush();