[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/14] block: enable in_use flag
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 14/14] block: enable in_use flag |
Date: |
Mon, 7 Feb 2011 13:40:30 +0100 |
From: Marcelo Tosatti <address@hidden>
Set block device in use during block migration, disallow drive_del and
bdrv_truncate for in use devices.
Signed-off-by: Marcelo Tosatti <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block-migration.c | 2 ++
block.c | 2 ++
blockdev.c | 4 ++++
3 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/block-migration.c b/block-migration.c
index 323e1e2..8218bac 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 ee9edfc..b476479 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 f2a00bd..ecfadc1 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();
--
1.7.2.3
- [Qemu-devel] [PATCH 05/14] ahci: add license header in ahci.h, (continued)
- [Qemu-devel] [PATCH 05/14] ahci: add license header in ahci.h, Kevin Wolf, 2011/02/07
- [Qemu-devel] [PATCH 07/14] ahci: send init d2h fis on fis enable, Kevin Wolf, 2011/02/07
- [Qemu-devel] [PATCH 04/14] ahci: split ICH9 from core, Kevin Wolf, 2011/02/07
- [Qemu-devel] [PATCH 06/14] ahci: split ICH and AHCI even more, Kevin Wolf, 2011/02/07
- [Qemu-devel] [PATCH 08/14] ahci: Implement HBA reset, Kevin Wolf, 2011/02/07
- [Qemu-devel] [PATCH 09/14] ahci: make number of ports runtime determined, Kevin Wolf, 2011/02/07
- [Qemu-devel] [PATCH 10/14] block-migration: actually disable dirty tracking on cleanup, Kevin Wolf, 2011/02/07
- [Qemu-devel] [PATCH 11/14] blockdev: add refcount to DriveInfo, Kevin Wolf, 2011/02/07
- [Qemu-devel] [PATCH 13/14] Add flag to indicate external users to block device, Kevin Wolf, 2011/02/07
- [Qemu-devel] [PATCH 12/14] block-migration: add reference to target DriveInfo, Kevin Wolf, 2011/02/07
- [Qemu-devel] [PATCH 14/14] block: enable in_use flag,
Kevin Wolf <=
- [Qemu-devel] Re: [PULL 00/14] Block patches for master, Anthony Liguori, 2011/02/07