diff options
| -rw-r--r-- | blockdev.c | 8 | ||||
| -rw-r--r-- | blockjob.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/blockdev.c b/blockdev.c index 0a519029b8..9a9bdec7da 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 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; } |