[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 02/16] block: check bdrv_in_use() before blockdev
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v6 02/16] block: check bdrv_in_use() before blockdev operations |
Date: |
Wed, 18 Jan 2012 14:40:41 +0000 |
Long-running block operations like block migration and image streaming
must have continual access to their block device. It is not safe to
perform operations like hotplug, eject, change, resize, commit, or
external snapshot while a long-running operation is in progress.
This patch adds the missing bdrv_in_use() checks so that block migration
and image streaming never have the rug pulled out from underneath them.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block.c | 4 ++++
blockdev.c | 16 +++++++++++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/block.c b/block.c
index 3f072f6..43f6484 100644
--- a/block.c
+++ b/block.c
@@ -1020,6 +1020,10 @@ int bdrv_commit(BlockDriverState *bs)
return -EACCES;
}
+ if (bdrv_in_use(bs) || bdrv_in_use(bs->backing_hd)) {
+ return -EBUSY;
+ }
+
backing_drv = bs->backing_hd->drv;
ro = bs->backing_hd->read_only;
strncpy(filename, bs->backing_hd->filename, sizeof(filename));
diff --git a/blockdev.c b/blockdev.c
index c832782..6d78b36 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -592,12 +592,18 @@ void do_commit(Monitor *mon, const QDict *qdict)
if (!strcmp(device, "all")) {
bdrv_commit_all();
} else {
+ int ret;
+
bs = bdrv_find(device);
if (!bs) {
qerror_report(QERR_DEVICE_NOT_FOUND, device);
return;
}
- bdrv_commit(bs);
+ ret = bdrv_commit(bs);
+ if (ret == -EBUSY) {
+ qerror_report(QERR_DEVICE_IN_USE, device);
+ return;
+ }
}
}
@@ -616,6 +622,10 @@ void qmp_blockdev_snapshot_sync(const char *device, const
char *snapshot_file,
error_set(errp, QERR_DEVICE_NOT_FOUND, device);
return;
}
+ if (bdrv_in_use(bs)) {
+ error_set(errp, QERR_DEVICE_IN_USE, device);
+ return;
+ }
pstrcpy(old_filename, sizeof(old_filename), bs->filename);
@@ -667,6 +677,10 @@ void qmp_blockdev_snapshot_sync(const char *device, const
char *snapshot_file,
static int eject_device(Monitor *mon, BlockDriverState *bs, int force)
{
+ if (bdrv_in_use(bs)) {
+ qerror_report(QERR_DEVICE_IN_USE, bdrv_get_device_name(bs));
+ return -1;
+ }
if (!bdrv_dev_has_removable_media(bs)) {
qerror_report(QERR_DEVICE_NOT_REMOVABLE, bdrv_get_device_name(bs));
return -1;
--
1.7.8.3
- [Qemu-devel] [PATCH v6 00/16] block: generic image streaming, Stefan Hajnoczi, 2012/01/18
- [Qemu-devel] [PATCH v6 02/16] block: check bdrv_in_use() before blockdev operations,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v6 04/16] block: add BlockJob interface for long-running operations, Stefan Hajnoczi, 2012/01/18
- [Qemu-devel] [PATCH v6 01/16] coroutine: add co_sleep_ns() coroutine sleep function, Stefan Hajnoczi, 2012/01/18
- [Qemu-devel] [PATCH v6 05/16] block: add image streaming block job, Stefan Hajnoczi, 2012/01/18
- [Qemu-devel] [PATCH v6 06/16] block: rate-limit streaming operations, Stefan Hajnoczi, 2012/01/18
- [Qemu-devel] [PATCH v6 08/16] qmp: add block_job_set_speed command, Stefan Hajnoczi, 2012/01/18
- [Qemu-devel] [PATCH v6 07/16] qmp: add block_stream command, Stefan Hajnoczi, 2012/01/18
- [Qemu-devel] [PATCH v6 03/16] block: make copy-on-read a per-request flag, Stefan Hajnoczi, 2012/01/18
- [Qemu-devel] [PATCH v6 11/16] blockdev: make image streaming safe across hotplug, Stefan Hajnoczi, 2012/01/18
- [Qemu-devel] [PATCH v6 13/16] add QERR_BASE_NOT_FOUND, Stefan Hajnoczi, 2012/01/18
- [Qemu-devel] [PATCH v6 14/16] block: add support for partial streaming, Stefan Hajnoczi, 2012/01/18