From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYJRZ-00014f-Oy for qemu-devel@nongnu.org; Thu, 10 Apr 2014 14:11:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WYJRS-0001mj-BJ for qemu-devel@nongnu.org; Thu, 10 Apr 2014 14:11:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46493) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYJRS-0001mY-2V for qemu-devel@nongnu.org; Thu, 10 Apr 2014 14:11:14 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s3AIBD5p017326 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 10 Apr 2014 14:11:13 -0400 From: Max Reitz Date: Thu, 10 Apr 2014 20:11:03 +0200 Message-Id: <1397153468-16498-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 0/5] qemu-img: Implement commit like QMP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi , Max Reitz qemu-img should use QMP commands whenever possible in order to ensure feature completeness of both online and offline image operations. For the "commit" command, this is relatively easy, so implement it first (in the hope that indeed others will follow). As qemu-img does not have access to QMP (due to QMP being intertwined with basically everything in qemu), we cannot directly use QMP, but at least use the functions the corresponding QMP commands are using (which would be "block-commit", in this case). This series depends on "block-commit: speed is an optional parameter". v3: - Patch 1: fixed indentation of commit_start() declaration in block_int.h [Eric] - Patch 2: moved out of this series which now depends on it [Kevin, in a sense] - Patch 3 (now 2/5): wait for actual completion of the blockjob (CB called) and evaluate the return value [Kevin] - Patch 4 (now 3/5): factor in the granularity of the blockjob [Kevin] - Patch 5 (now 4/5): - s/backing_file/base/g in documentation [Fam] - s/unto/into/g, s/shall/will/ [Eric] - s/filename/base/ in a certain spot [Fam] v2 (mostly following Eric's comments): - Patch 1: - allow giving the granularity as 0 in order to enforce the default value - use is_power_of_2() instead of manually inlining it - use "if (!has_x) { x = DEFAULT_VALUE; }" (which is the common pattern in blockdev.c) instead of "x = has_x ? x : DEFAULT_VALUE;" - Patch 2: - "if (!has_x) { x = DEFAULT_VALUE; }" with a fixed condition - Patch 3: - don't use obsolete error_is_set() - use bs->backing_hd instead of bdrv_find_base(), as the latter actually finds the very base of the backing chain which does not correspond to the current qemu-img commit behavior (which is to commit into the first backing file) - Added patches 5 and 6 Max Reitz (5): block-commit: Expose granularity qemu-img: Implement commit like QMP qemu-img: Enable progress output for commit qemu-img: Specify backing file for commit iotests: Commit tests for two-layer backing chains block/Makefile.objs | 2 +- block/commit.c | 16 +- block/mirror.c | 4 +- blockdev.c | 22 +- include/block/block_int.h | 10 +- qapi-schema.json | 6 +- qemu-img-cmds.hx | 4 +- qemu-img.c | 144 ++- qemu-img.texi | 8 +- tests/qemu-iotests/020 | 57 +- tests/qemu-iotests/020.out | 2168 ++++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 2397 insertions(+), 44 deletions(-) -- 1.9.1