From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrlmE-0000JK-1h for qemu-devel@nongnu.org; Fri, 21 Nov 2014 05:49:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xrlm7-0004O0-GL for qemu-devel@nongnu.org; Fri, 21 Nov 2014 05:49:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53926) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xrlm7-0004Ns-8U for qemu-devel@nongnu.org; Fri, 21 Nov 2014 05:49:15 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sALAnEUI030918 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 21 Nov 2014 05:49:14 -0500 From: Stefan Hajnoczi Date: Fri, 21 Nov 2014 10:49:00 +0000 Message-Id: <1416566940-4430-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1416566940-4430-1-git-send-email-stefanha@redhat.com> References: <1416566940-4430-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] blockdev: check for BLOCK_OP_TYPE_EXTERNAL_SNAPSHOT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Stefan Hajnoczi , mreitz@redhat.com The BLOCK_OP_TYPE_EXTERNAL_SNAPSHOT op blocker exists but was never used! Let's fix that so external snapshot can be blocked. Signed-off-by: Stefan Hajnoczi --- blockdev.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/blockdev.c b/blockdev.c index 90cb33d..d63bb7f 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1236,6 +1236,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_read_only(bs)) { error_set(errp, QERR_DEVICE_IS_READ_ONLY, device); return; -- 2.1.0