[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 08/10] block: Add checks of blocker in block oper
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v6 08/10] block: Add checks of blocker in block operations |
Date: |
Thu, 28 Nov 2013 16:39:40 +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>
---
block/snapshot.c | 11 +++++++++++
blockdev.c | 8 ++++++++
2 files changed, 19 insertions(+)
diff --git a/block/snapshot.c b/block/snapshot.c
index 31d141b..6107be9 100644
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -146,6 +146,11 @@ int bdrv_snapshot_create(BlockDriverState *bs,
if (!drv) {
return -ENOMEDIUM;
}
+
+ if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_INTERNAL_SNAPSHOT, errp)) {
+ return -EPERM;
+ }
+
if (drv->bdrv_snapshot_create) {
return drv->bdrv_snapshot_create(bs, sn_info);
}
@@ -215,6 +220,12 @@ int bdrv_snapshot_delete(BlockDriverState *bs,
error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, bdrv_get_device_name(bs));
return -ENOMEDIUM;
}
+
+ if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_INTERNAL_SNAPSHOT_DELETE,
+ errp)) {
+ return -EPERM;
+ }
+
if (!snapshot_id && !name) {
error_setg(errp, "snapshot_id and name are both NULL");
return -EINVAL;
diff --git a/blockdev.c b/blockdev.c
index 3e4ab66..6616564 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1536,6 +1536,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 +1688,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 v6 00/10] Drop in_use from BlockDriverState and enable point-in-time snapshot exporting over NBD, Fam Zheng, 2013/11/28
- [Qemu-devel] [PATCH v6 01/10] qapi: Add BlockOperationType enum, Fam Zheng, 2013/11/28
- [Qemu-devel] [PATCH v6 02/10] block: Introduce op_blockers to BlockDriverState, Fam Zheng, 2013/11/28
- [Qemu-devel] [PATCH v6 03/10] block: Parse "backing" option to reference existing BDS, Fam Zheng, 2013/11/28
- [Qemu-devel] [PATCH v6 04/10] block: support dropping active in bdrv_drop_intermediate, Fam Zheng, 2013/11/28
- [Qemu-devel] [PATCH v6 05/10] stream: Use bdrv_drop_intermediate and drop close_unused_images, Fam Zheng, 2013/11/28
- [Qemu-devel] [PATCH v6 06/10] block: Replace in_use with operation blocker, Fam Zheng, 2013/11/28
- [Qemu-devel] [PATCH v6 07/10] block: Pass error in bdrv_snapshot_create, Fam Zheng, 2013/11/28
- [Qemu-devel] [PATCH v6 08/10] block: Add checks of blocker in block operations,
Fam Zheng <=
- [Qemu-devel] [PATCH v6 10/10] block: Allow backup on referenced named BlockDriverState, Fam Zheng, 2013/11/28
- [Qemu-devel] [PATCH v6 09/10] qmp: add command 'blockdev-backup', Fam Zheng, 2013/11/28