[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 4/7] block: Add checks of blocker in block operat
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v5 4/7] block: Add checks of blocker in block operations |
Date: |
Tue, 26 Nov 2013 12:05:25 +0800 |
Before operate on a BlockDriverState, respective types are checked
against bs->op_blockers and it will error out if there's a blocker.
Signed-off-by: Fam Zheng <address@hidden>
---
blockdev.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/blockdev.c b/blockdev.c
index 1efa806..cfb815f 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1001,6 +1001,11 @@ SnapshotInfo
*qmp_blockdev_snapshot_delete_internal_sync(const char *device,
return NULL;
}
+ if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_INTERNAL_SNAPSHOT_DELETE,
+ errp)) {
+ return NULL;
+ }
+
ret = bdrv_snapshot_find_by_id_and_name(bs, id, name, &sn, &local_err);
if (error_is_set(&local_err)) {
error_propagate(errp, local_err);
@@ -1098,6 +1103,10 @@ static void
internal_snapshot_prepare(BlkTransactionState *common,
return;
}
+ if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_INTERNAL_SNAPSHOT, errp)) {
+ return;
+ }
+
if (!bdrv_is_inserted(bs)) {
error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, device);
return;
@@ -1536,6 +1545,10 @@ void qmp_change_blockdev(const char *device, const char
*filename,
return;
}
+ if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_CHANGE, errp)) {
+ return;
+ }
+
if (format) {
drv = bdrv_find_whitelisted_format(format, bs->read_only);
if (!drv) {
@@ -1684,6 +1697,10 @@ void qmp_block_resize(const char *device, int64_t size,
Error **errp)
return;
}
+ if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_RESIZE, errp)) {
+ return;
+ }
+
if (size < 0) {
error_set(errp, QERR_INVALID_PARAMETER_VALUE, "size", "a >0 size");
return;
--
1.8.4.2
- [Qemu-devel] [PATCH v5 0/7] Drop in_use from BlockDriverState and enable point-in-time snapshot exporting over NBD, Fam Zheng, 2013/11/25
- [Qemu-devel] [PATCH v5 1/7] qapi: Add BlockOperationType enum, Fam Zheng, 2013/11/25
- [Qemu-devel] [PATCH v5 2/7] block: Introduce op_blockers to BlockDriverState, Fam Zheng, 2013/11/25
- [Qemu-devel] [PATCH v5 3/7] block: Replace in_use with operation blocker, Fam Zheng, 2013/11/25
- [Qemu-devel] [PATCH v5 4/7] block: Add checks of blocker in block operations,
Fam Zheng <=
- [Qemu-devel] [PATCH v5 5/7] block: Parse "backing" option to reference existing BDS, Fam Zheng, 2013/11/25
- [Qemu-devel] [PATCH v5 6/7] qmp: add command 'blockdev-backup', Fam Zheng, 2013/11/25
- [Qemu-devel] [PATCH v5 7/7] block: Allow backup on referenced named BlockDriverState, Fam Zheng, 2013/11/25