[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 09/33] block: Move op_blocker check from block_job
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 09/33] block: Move op_blocker check from block_job_create to its caller |
Date: |
Wed, 28 May 2014 14:32:19 +0200 |
From: Fam Zheng <address@hidden>
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>
Reviewed-by: Jeff Cody <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
blockdev.c | 8 ++++++++
blockjob.c | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/blockdev.c b/blockdev.c
index 0a51902..9a9bdec 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1889,6 +1889,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) {
@@ -1933,6 +1937,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 60e72f5..7d84ca1 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.3
- [Qemu-devel] [PULL v2 00/33] Block patches, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 01/33] qemu-iotests: Handle cache mode option in 091, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 02/33] QemuOpt: add unit tests, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 03/33] qcow2: Fix memory leak in COW error path, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 04/33] aio: Fix use-after-free in cancellation path, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 06/33] block: Add BlockOpType enum, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 05/33] iotests: Use _img_info in test 089, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 07/33] block: Introduce op_blockers to BlockDriverState, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 09/33] block: Move op_blocker check from block_job_create to its caller,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v2 08/33] block: Replace in_use with operation blocker, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 10/33] block: Add bdrv_set_backing_hd(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 11/33] block: Use bdrv_set_backing_hd everywhere, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 12/33] block: Add backing_blocker in BlockDriverState, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 13/33] block: Drop redundant bdrv_refresh_limits, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 14/33] docs: Define refcount_bits value, Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 15/33] blockdev: Don't use qerror_report_err() in drive_init(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 16/33] blockdev: Don't use qerror_report() in do_drive_del(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 17/33] qemu-nbd: Don't use qerror_report(), Stefan Hajnoczi, 2014/05/28
- [Qemu-devel] [PULL v2 19/33] block/ssh: Drop superfluous libssh2_session_last_errno() calls, Stefan Hajnoczi, 2014/05/28