From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45131) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vr1ZT-0006ea-B2 for qemu-devel@nongnu.org; Thu, 12 Dec 2013 03:24:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vr1ZR-0002pr-RM for qemu-devel@nongnu.org; Thu, 12 Dec 2013 03:24:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51374) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vr1ZR-0002pZ-K6 for qemu-devel@nongnu.org; Thu, 12 Dec 2013 03:24:33 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rBC8OW0V015573 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 12 Dec 2013 03:24:32 -0500 From: Fam Zheng Date: Thu, 12 Dec 2013 16:23:44 +0800 Message-Id: <1386836626-6436-9-git-send-email-famz@redhat.com> In-Reply-To: <1386836626-6436-1-git-send-email-famz@redhat.com> References: <1386836626-6436-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v7 08/10] block: Add checks of blocker in block operations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, rjones@redhat.com, armbru@redhat.com, imain@redhat.com, stefanha@redhat.com, pbonzini@redhat.com 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 --- block/snapshot.c | 11 +++++++++++ blockdev.c | 8 ++++++++ 2 files changed, 19 insertions(+) diff --git a/block/snapshot.c b/block/snapshot.c index 02cfb07..0dc8f40 100644 --- a/block/snapshot.c +++ b/block/snapshot.c @@ -164,6 +164,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); } @@ -233,6 +238,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 404159e..5e5d1b0 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.5.1