From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 14/14] block: enable in_use flag
Date: Mon, 7 Feb 2011 13:40:30 +0100 [thread overview]
Message-ID: <1297082430-628-15-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1297082430-628-1-git-send-email-kwolf@redhat.com>
From: Marcelo Tosatti <mtosatti@redhat.com>
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>
---
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
next prev parent reply other threads:[~2011-02-07 12:39 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-07 12:40 [Qemu-devel] [PULL 00/14] Block patches for master Kevin Wolf
2011-02-07 12:40 ` [Qemu-devel] [PATCH 01/14] qcow2: Really use cache=unsafe for image creation Kevin Wolf
2011-02-07 12:40 ` [Qemu-devel] [PATCH 02/14] Documentation: add Sheepdog disk images Kevin Wolf
2011-02-07 12:40 ` [Qemu-devel] [PATCH 03/14] block/vdi: Fix wrong size in conditionally used memset, memcmp Kevin Wolf
2011-02-07 12:40 ` [Qemu-devel] [PATCH 04/14] ahci: split ICH9 from core Kevin Wolf
2011-02-07 12:40 ` [Qemu-devel] [PATCH 05/14] ahci: add license header in ahci.h Kevin Wolf
2011-02-07 12:40 ` [Qemu-devel] [PATCH 06/14] ahci: split ICH and AHCI even more Kevin Wolf
2011-02-07 12:40 ` [Qemu-devel] [PATCH 07/14] ahci: send init d2h fis on fis enable Kevin Wolf
2011-02-07 12:40 ` [Qemu-devel] [PATCH 08/14] ahci: Implement HBA reset Kevin Wolf
2011-02-07 12:40 ` [Qemu-devel] [PATCH 09/14] ahci: make number of ports runtime determined Kevin Wolf
2011-02-07 12:40 ` [Qemu-devel] [PATCH 10/14] block-migration: actually disable dirty tracking on cleanup Kevin Wolf
2011-02-07 12:40 ` [Qemu-devel] [PATCH 11/14] blockdev: add refcount to DriveInfo Kevin Wolf
2011-02-07 12:40 ` [Qemu-devel] [PATCH 12/14] block-migration: add reference to target DriveInfo Kevin Wolf
2011-02-07 12:40 ` [Qemu-devel] [PATCH 13/14] Add flag to indicate external users to block device Kevin Wolf
2011-02-07 12:40 ` Kevin Wolf [this message]
2011-02-07 13:26 ` [Qemu-devel] Re: [PULL 00/14] Block patches for master Anthony Liguori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1297082430-628-15-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=anthony@codemonkey.ws \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).