path: root/blockjob.c
diff options
authorFam Zheng <famz@redhat.com>2014-05-23 21:29:44 +0800
committerStefan Hajnoczi <stefanha@redhat.com>2014-05-28 14:28:46 +0200
commit628ff683034c83ce54a1ae91d898d44e34f4851a (patch)
treede3e6221be40eb9a09a4edae7b275c9b59887391 /blockjob.c
parent3718d8ab65f68de2acccbe6a315907805f54e3cc (diff)
block: Move op_blocker check from block_job_create to its caller
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 <famz@redhat.com> Reviewed-by: Benoit Canet <benoit@irqsave.net> Reviewed-by: Jeff Cody <jcody@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'blockjob.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/blockjob.c b/blockjob.c
index 60e72f5d90..7d84ca1d6c 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;