From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGQzk-0005vH-KF for qemu-devel@nongnu.org; Mon, 02 Sep 2013 06:04:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGQze-0003QI-Ga for qemu-devel@nongnu.org; Mon, 02 Sep 2013 06:04:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGQze-0003QB-7Z for qemu-devel@nongnu.org; Mon, 02 Sep 2013 06:04:22 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r82A4L6R014119 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 2 Sep 2013 06:04:21 -0400 From: Max Reitz Date: Mon, 2 Sep 2013 12:04:01 +0200 Message-Id: <1378116246-12855-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v4 0/5] block/qcow2: Image file option amendment List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz This series adds support to qemu-img, block and qcow2 for amending image options on existing image files. Depends on: - option: Add assigned flag to QEMUOptionParameter - qcow2-refcount: Snapshot update for zero clusters (series, v3) - Add metadata overlap checks (series, v5) v4: - rebased on the metadata overlap check series (and fit to it) - split patch 2 into three distinct patches (2, 3 and 4) - extended test for zero expansion on backed and inactive backed clusters (and fixed according to the metadata overlap check series (i.e., adjusted header length)) - fixed zero expansion with shared L2 tables v3: - deallocate non-preallocated zero clusters on non-backed images instead of zero expanding them - qcow2 version downgrade: error out on refcount_order != 4 - implemented Eric's comments regarding the qemu-img amend and img_amend itself v2: - Generally implemented Kevin's comments, especially: - Zero cluster expansion for inactive L2 tables - Correct handling of preallocated zero clusters - More test cases Max Reitz (5): block: Image file option amendment qcow2-cluster: Expand zero clusters qcow2: Save refcount order in BDRVQcowState qcow2: Implement bdrv_amend_options qemu-iotest: qcow2 image option amendment block.c | 8 ++ block/qcow2-cluster.c | 228 +++++++++++++++++++++++++++++ block/qcow2-refcount.c | 29 ++-- block/qcow2.c | 198 ++++++++++++++++++++++++- block/qcow2.h | 6 + include/block/block.h | 2 + include/block/block_int.h | 3 + qemu-img-cmds.hx | 6 + qemu-img.c | 84 +++++++++++ qemu-img.texi | 5 + tests/qemu-iotests/061 | 178 +++++++++++++++++++++++ tests/qemu-iotests/061.out | 349 +++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/group | 1 + 13 files changed, 1082 insertions(+), 15 deletions(-) create mode 100755 tests/qemu-iotests/061 create mode 100644 tests/qemu-iotests/061.out -- 1.8.3.1