From patchwork Fri Feb 8 15:06:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Shinkevich X-Patchwork-Id: 1038685 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43wz8y2pxxz9sNG for ; Sat, 9 Feb 2019 02:08:50 +1100 (AEDT) Received: from localhost ([127.0.0.1]:57789 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gs7lo-0003RY-4Y for incoming@patchwork.ozlabs.org; Fri, 08 Feb 2019 10:08:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45462) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gs7jN-0001rn-1z for qemu-devel@nongnu.org; Fri, 08 Feb 2019 10:06:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gs7jL-0004DO-PH for qemu-devel@nongnu.org; Fri, 08 Feb 2019 10:06:17 -0500 Received: from relay.sw.ru ([185.231.240.75]:42362) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gs7jL-0004BQ-Fb; Fri, 08 Feb 2019 10:06:15 -0500 Received: from [172.16.25.136] (helo=localhost.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1gs7jG-00049T-2s; Fri, 08 Feb 2019 18:06:10 +0300 From: Andrey Shinkevich To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 8 Feb 2019 18:06:05 +0300 Message-Id: <1549638368-530182-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 v14 0/3] qcow2: Add list of bitmaps to ImageInfoSpecificQCow2 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: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com, armbru@redhat.com, mreitz@redhat.com, andrey.shinkevich@virtuozzo.com, den@openvz.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" v14: The test 242 was amended to be safer against changes in the bitmap allocation algorithm because the bitmap directory is reallocated on VM shutdown. Unfortunately, an empty line at the end of the benchmark file 242.out persists. The version #13 was discussed in email thread with the message ID: <1549448589-381285-1-git-send-email-andrey.shinkevich@virtuozzo.com> v13: The enhancement of the Python code style for fopen() in the new test 242. The 'unknown flag' was actually removed from the structure Qcow2BitmapInfo. v12: In the function block_crypto_get_specific_info_luks(), checking the format was replaced with assertion. The 'unknown flag' was removed from the structure Qcow2BitmapInfo. A new case added to the test file 242 to check QEMU behavior in case of unknown flag in a bitmap directory entry of QCOW2 image file. v11: An assertion was added to the get_bitmap_info_flags() to check the completed mapping of all the reserved bitmap BME_ flags. The heading comment of get_bitmap_info_flags() was changed to describe the function design properly. In qcow2_get_specific_info(), two function calls g_free() were replaced with one call to qapi_free_ImageInfoSpecific() that does all the cleaning work. The version #11 was discussed in email thread with the message ID: <1548942405-760115-1-git-send-email-andrey.shinkevich@virtuozzo.com> v10: The 'struct Error' parameter was added to the function prototype bdrv_query_image_info(). The code refactoring of the function get_bitmap_info_flags(). The comments to the structures ImageInfoSpecificQCow2 and Qcow2BitmapInfo in the file qapi/block-core.json were corrected. The changes in the *.out files of the tests 060, 065 082, 198 and 206 were discarded. The new test 239 was enriched by adding human readable format output and by checking the output with bitmap extra parameters, such as non-persistent and disabled. The version #10 was discussed in email thread with the message ID: <1548870690-647481-1-git-send-email-andrey.shinkevich@virtuozzo.com> v9: The new test 239 of the qemu-iotests set was amended to show the bitmaps being added and to demonstrate the bitmap flag "in-use". The version #9 was discussed with the message ID: <1548705688-1027522-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. The version #8 was discussed in email thread with the message ID: <1548700805-1016533-1-git-send-email-andrey.shinkevich@virtuozzo.com> 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. The version #7 was discussed in email thread with the message ID: <1544698788-52893-1-git-send-email-andrey.shinkevich@virtuozzo.com> 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 (3): bdrv_query_image_info Error parameter added qcow2: Add list of bitmaps to ImageInfoSpecificQCow2 qcow2: list of bitmaps new test 242 block.c | 5 +- block/crypto.c | 9 +-- block/qapi.c | 7 +- block/qcow2-bitmap.c | 76 +++++++++++++++++++++ block/qcow2.c | 21 +++++- block/qcow2.h | 2 + block/vmdk.c | 3 +- include/block/block.h | 3 +- include/block/block_int.h | 3 +- qapi/block-core.json | 41 ++++++++++- qemu-io-cmds.c | 7 +- tests/qemu-iotests/242 | 103 ++++++++++++++++++++++++++++ tests/qemu-iotests/242.out | 165 +++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/group | 1 + 14 files changed, 429 insertions(+), 17 deletions(-) create mode 100755 tests/qemu-iotests/242 create mode 100644 tests/qemu-iotests/242.out Reviewed-by: Vladimir Sementsov-Ogievskiy