From patchwork Mon Aug 8 15:05:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 9268601 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CBB9A6075A for ; Mon, 8 Aug 2016 15:45:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE24D2815E for ; Mon, 8 Aug 2016 15:45:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B2E46283F6; Mon, 8 Aug 2016 15:45:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 643EF2815E for ; Mon, 8 Aug 2016 15:45:37 +0000 (UTC) Received: from localhost ([::1]:58213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWmkC-0005CZ-Ei for patchwork-qemu-devel@patchwork.kernel.org; Mon, 08 Aug 2016 11:45:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWm7a-00072o-4Q for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bWm7V-0004YT-Eq for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:40 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:23725 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWm7U-0004Wg-Ly for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:37 -0400 Received: from kvm.qa.sw.ru. ([10.28.8.145]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u77NfZcX001857; Mon, 8 Aug 2016 02:41:38 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Mon, 8 Aug 2016 18:05:12 +0300 Message-Id: <1470668720-211300-22-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1470668720-211300-1-git-send-email-vsementsov@virtuozzo.com> References: <1470668720-211300-1-git-send-email-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH 21/29] qcow2-bitmap: add EXTRA_DATA_COMPATIBLE flag X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, famz@redhat.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP If this flag is unset and extra data is present the bitmap should be read-only. For now just return error for this case. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/qcow2-bitmap.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index 1c46dcb..a00eae4 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -47,6 +47,7 @@ #define BME_RESERVED_FLAGS 0xfffffffc #define BME_FLAG_IN_USE 1 #define BME_FLAG_AUTO (1U << 1) +#define BME_FLAG_EXTRA_DATA_COMPATIBLE (1U << 1) /* bits [1, 8] U [56, 63] are reserved */ #define BME_TABLE_ENTRY_RESERVED_MASK 0xff000000000001fe @@ -600,6 +601,13 @@ static BdrvDirtyBitmap *load_bitmap(BlockDriverState *bs, goto fail; } + if (!(bmh->flags & BME_FLAG_EXTRA_DATA_COMPATIBLE) && + bmh->extra_data_size != 0) { + error_setg(errp, "Incompatible extra data found for bitmap '%s'", + name); + goto fail; + } + ret = bitmap_table_load(bs, bmh, &bitmap_table); if (ret < 0) { error_setg_errno(errp, -ret,