diff --git a/block-migration.c b/block-migration.c index 323e1e2bcd39a159aad67944268c8623ba6f3a20..8218bac09c6cd30286a4ce5b826ac378700036da 100644 --- a/block-migration.c +++ b/block-migration.c @@ -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); diff --git a/block.c b/block.c index ee9edfce2c816e3487b69c3777337caceea85cd0..b476479e0dc9c1cb1f659c4a5db1af9e3e1005e3 100644 --- a/block.c +++ b/block.c @@ -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); diff --git a/blockdev.c b/blockdev.c index f2a00bd214a0f8953570aab239cffb7a76982988..ecfadc138fc34808d7492ac1a47eef964677a641 100644 --- a/blockdev.c +++ b/blockdev.c @@ -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();