From patchwork Mon Jan 28 18:40:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Shinkevich X-Patchwork-Id: 10784525 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B4FAE922 for ; Mon, 28 Jan 2019 19:04:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A25AA2B183 for ; Mon, 28 Jan 2019 19:04:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 965612B1F7; Mon, 28 Jan 2019 19:04:07 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0600A2B1ED for ; Mon, 28 Jan 2019 19:04:06 +0000 (UTC) Received: from localhost ([127.0.0.1]:37170 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goCCU-0002kJ-7z for patchwork-qemu-devel@patchwork.kernel.org; Mon, 28 Jan 2019 14:04:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goBpU-0001dU-Gx for qemu-devel@nongnu.org; Mon, 28 Jan 2019 13:40:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goBpR-0005aC-K1 for qemu-devel@nongnu.org; Mon, 28 Jan 2019 13:40:20 -0500 Received: from relay.sw.ru ([185.231.240.75]:35432) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1goBpR-0005Oo-7L; Mon, 28 Jan 2019 13:40:17 -0500 Received: from [172.16.25.136] (helo=localhost.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1goBpF-0005D9-G8; Mon, 28 Jan 2019 21:40:05 +0300 From: Andrey Shinkevich To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Mon, 28 Jan 2019 21:40:03 +0300 Message-Id: <1548700805-1016533-1-git-send-email-andrey.shinkevich@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v8 0/2] qemu-img info lists bitmap directory entries 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, armbru@redhat.com, mreitz@redhat.com, andrey.shinkevich@virtuozzo.com, den@openvz.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Here is the update for the bitmap extension of the qcow2 specific information as the output of the 'qemu-img info' command. The version #7 was in email with the message ID: <1544698788-52893-1-git-send-email-andrey.shinkevich@virtuozzo.com> v8: The output benchmark files for the qemu-iotests, namely 060, 065 082, 198 and 206, were modified to show the bitmap extension for the qemu specific information. A new test file 239 was added to the test set that checks the output for the fields of the bitmap section. The backward compatibility of the output for images of the version 2 of qcow2 was added. v7: A description was added to the function qcow2_get_bitmap_info_list(). In the function qcow2_get_specific_info(), the comment was modified so that we ignore any error in obtaining the list of bitmaps to pass the rest of QCOW2 specific information to a caller. v6: '[PATCH v6] qemu-img info lists bitmap directory entries'. The error handling logic for the bitmaps empty list was reversed. v5: '[PATCH v5] qemu-img info lists bitmap directory entries'. The error handling logic for the bitmaps empty list was fixed and documented. v4: '[PATCH v4] qemu-img info lists bitmap directory entries'. Unknown flags are checked with the mask BME_RESERVED_FLAGS. The code minor refactoring was made. v3: '[PATCH v3] qemu-img info lists bitmap directory entries'. Now, qcow2_get_bitmap_info_list() is invoked under the condition of QCOW version #3 to avoid memory leaks in case of QCOW version #2. Furthermore, qcow2_get_bitmap_info_list() checks the number of existing bitmaps. So, if no bitmap exists, no bitmap error message is printed in the output. The data type of the bitmap 'granularity' parameter was left as 'uint32' because bitmap_list_load() returns error if granularity_bits is grater than 31. v2: '[PATCH v2] qemu-img info lists bitmap directory entries'. The targeted version of the release at 'Since' word of the comments to the new structures changed to 4.0 in the file qapi/block-core.json. A comment to the 'bitmaps' new member was supplied. The 'unknown flags' parameter was introduced to indicate presence of QCOW2 bitmap unknown flags, if any. The word 'dirty' was removed from the code and from the comments as we list all the bitmaps. The 'bitmaps' printed parameter was removed for the release versions earlier than 3.x. The example of the output was moved above the 'Signed-off-by' line. The first version was '[PATCH] qemu-img info lists bitmap directory entries'. Andrey Shinkevich (2): qemu-img info lists bitmap directory entries qemu-img info: bitmaps extension new test 239 block/qapi.c | 6 +++++ block/qcow2-bitmap.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.c | 13 ++++++++++ block/qcow2.h | 2 ++ qapi/block-core.json | 42 +++++++++++++++++++++++++++++- tests/qemu-iotests/060.out | 1 + tests/qemu-iotests/065 | 16 ++++++------ tests/qemu-iotests/082.out | 7 +++++ tests/qemu-iotests/198.out | 2 ++ tests/qemu-iotests/206.out | 5 ++++ tests/qemu-iotests/239 | 58 +++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/239.out | 33 ++++++++++++++++++++++++ tests/qemu-iotests/group | 1 + 13 files changed, 241 insertions(+), 9 deletions(-) create mode 100755 tests/qemu-iotests/239 create mode 100644 tests/qemu-iotests/239.out