From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47606) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vl9uV-0007LQ-DE for qemu-devel@nongnu.org; Mon, 25 Nov 2013 23:06:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vl9uP-00010k-FE for qemu-devel@nongnu.org; Mon, 25 Nov 2013 23:06:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44337) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vl9uP-00010Y-5z for qemu-devel@nongnu.org; Mon, 25 Nov 2013 23:05:57 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rAQ45uGg017718 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 25 Nov 2013 23:05:56 -0500 From: Fam Zheng Date: Tue, 26 Nov 2013 12:05:25 +0800 Message-Id: <1385438728-17924-5-git-send-email-famz@redhat.com> In-Reply-To: <1385438728-17924-1-git-send-email-famz@redhat.com> References: <1385438728-17924-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v5 4/7] 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, hbrock@redhat.com, rjones@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 --- 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