[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v16 04/14] block: Move op_blocker check from block_j
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v16 04/14] block: Move op_blocker check from block_job_create to its caller |
Date: |
Fri, 7 Mar 2014 16:20:46 +0800 |
It makes no sense to check for "any" blocker on bs, we are here only
because of the mechanical conversion from in_use to op_blockers. Remove
it now, and let the callers check specific operation types. Backup and
mirror already have it, add checker to stream and commit.
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
---
blockdev.c | 8 ++++++++
blockjob.c | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/blockdev.c b/blockdev.c
index c0c71ca..228bf24 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1846,6 +1846,10 @@ void qmp_block_stream(const char *device, bool has_base,
return;
}
+ if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_STREAM, errp)) {
+ return;
+ }
+
if (base) {
base_bs = bdrv_find_backing_image(bs, base);
if (base_bs == NULL) {
@@ -1886,6 +1890,10 @@ void qmp_block_commit(const char *device,
return;
}
+ if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_COMMIT, errp)) {
+ return;
+ }
+
/* default top_bs is the active layer */
top_bs = bs;
diff --git a/blockjob.c b/blockjob.c
index f643a78..3e33051 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -41,7 +41,7 @@ void *block_job_create(const BlockJobDriver *driver,
BlockDriverState *bs,
{
BlockJob *job;
- if (bs->job || !bdrv_op_blocker_is_empty(bs)) {
+ if (bs->job) {
error_set(errp, QERR_DEVICE_IN_USE, bdrv_get_device_name(bs));
return NULL;
}
--
1.9.0
- [Qemu-devel] [PATCH v16 00/14] Drop in_use from BlockDriverState and enable point-in-time snapshot exporting over NBD, Fam Zheng, 2014/03/07
- [Qemu-devel] [PATCH v16 01/14] block: Add BlockOpType enum, Fam Zheng, 2014/03/07
- [Qemu-devel] [PATCH v16 02/14] block: Introduce op_blockers to BlockDriverState, Fam Zheng, 2014/03/07
- [Qemu-devel] [PATCH v16 03/14] block: Replace in_use with operation blocker, Fam Zheng, 2014/03/07
- [Qemu-devel] [PATCH v16 04/14] block: Move op_blocker check from block_job_create to its caller,
Fam Zheng <=
- [Qemu-devel] [PATCH v16 05/14] block: Add bdrv_set_backing_hd(), Fam Zheng, 2014/03/07
- [Qemu-devel] [PATCH v16 06/14] block: Add backing_blocker in BlockDriverState, Fam Zheng, 2014/03/07
- [Qemu-devel] [PATCH v16 07/14] block: Parse "backing" option to reference existing BDS, Fam Zheng, 2014/03/07
- [Qemu-devel] [PATCH v16 08/14] block: Support dropping active in bdrv_drop_intermediate, Fam Zheng, 2014/03/07
- [Qemu-devel] [PATCH v16 09/14] stream: Use bdrv_drop_intermediate and drop close_unused_images, Fam Zheng, 2014/03/07
- [Qemu-devel] [PATCH v16 10/14] qmp: Add command 'blockdev-backup', Fam Zheng, 2014/03/07
- [Qemu-devel] [PATCH v16 11/14] block: Allow backup on referenced named BlockDriverState, Fam Zheng, 2014/03/07
- [Qemu-devel] [PATCH v16 12/14] block: Add blockdev-backup to transaction, Fam Zheng, 2014/03/07
- [Qemu-devel] [PATCH v16 13/14] qemu-iotests: Test blockdev-backup in 055, Fam Zheng, 2014/03/07
- [Qemu-devel] [PATCH v16 14/14] qemu-iotests: Image fleecing test case 083, Fam Zheng, 2014/03/07