From patchwork Tue May 31 09:15:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 9144043 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 6CDC860761 for ; Tue, 31 May 2016 09:25:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E7032793B for ; Tue, 31 May 2016 09:25:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5322127BF0; Tue, 31 May 2016 09:25:43 +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 93F3F2793B for ; Tue, 31 May 2016 09:25:42 +0000 (UTC) Received: from localhost ([::1]:35393 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7fvh-00064m-7d for patchwork-qemu-devel@patchwork.kernel.org; Tue, 31 May 2016 05:25:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38340) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7fmP-0006LH-8p for qemu-devel@nongnu.org; Tue, 31 May 2016 05:16:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b7fmN-0005Y6-Ul for qemu-devel@nongnu.org; Tue, 31 May 2016 05:16:05 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:33494 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7fmN-0005Xw-HQ for qemu-devel@nongnu.org; Tue, 31 May 2016 05:16:03 -0400 Received: from irbis.sw.ru ([10.30.2.139]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u4V9FUaP003235; Tue, 31 May 2016 12:15:51 +0300 (MSK) From: "Denis V. Lunev" To: qemu-devel@nongnu.org Date: Tue, 31 May 2016 12:15:28 +0300 Message-Id: <1464686130-12265-10-git-send-email-den@openvz.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1464686130-12265-1-git-send-email-den@openvz.org> References: <1464686130-12265-1-git-send-email-den@openvz.org> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH 09/11] blockdev-backup: added support for data compression 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: Kevin Wolf , Pavel Butsykin , Jeff Cody , Markus Armbruster , Stefan Hajnoczi , den@openvz.org, John Snow Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Pavel Butsykin The idea is simple - backup is "written-once" data. It is written block by block and it is large enough. It would be nice to save storage space and compress it. Signed-off-by: Pavel Butsykin Signed-off-by: Denis V. Lunev CC: Jeff Cody CC: Markus Armbruster CC: Eric Blake CC: John Snow CC: Stefan Hajnoczi CC: Kevin Wolf Reviewed-by: Stefan Hajnoczi --- blockdev.c | 10 +++++++++- qapi/block-core.json | 4 ++++ qmp-commands.hx | 4 +++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/blockdev.c b/blockdev.c index b24f508..e72dddf 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1924,6 +1924,7 @@ typedef struct BlockdevBackupState { static void do_blockdev_backup(const char *device, const char *target, enum MirrorSyncMode sync, bool has_speed, int64_t speed, + bool has_compress, bool compress, bool has_on_source_error, BlockdevOnError on_source_error, bool has_on_target_error, @@ -1971,6 +1972,7 @@ static void blockdev_backup_prepare(BlkActionState *common, Error **errp) do_blockdev_backup(backup->device, backup->target, backup->sync, backup->has_speed, backup->speed, + backup->has_compress, backup->compress, backup->has_on_source_error, backup->on_source_error, backup->has_on_target_error, backup->on_target_error, common->block_job_txn, &local_err); @@ -3337,6 +3339,7 @@ BlockDeviceInfoList *qmp_query_named_block_nodes(Error **errp) void do_blockdev_backup(const char *device, const char *target, enum MirrorSyncMode sync, bool has_speed, int64_t speed, + bool has_compress, bool compress, bool has_on_source_error, BlockdevOnError on_source_error, bool has_on_target_error, @@ -3358,6 +3361,9 @@ void do_blockdev_backup(const char *device, const char *target, if (!has_on_target_error) { on_target_error = BLOCKDEV_ON_ERROR_REPORT; } + if (!has_compress) { + compress = false; + } blk = blk_by_name(device); if (!blk) { @@ -3387,7 +3393,7 @@ void do_blockdev_backup(const char *device, const char *target, target_bs = blk_bs(target_blk); bdrv_set_aio_context(target_bs, aio_context); - backup_start(bs, target_bs, speed, sync, NULL, false, on_source_error, + backup_start(bs, target_bs, speed, sync, NULL, compress, on_source_error, on_target_error, block_job_cb, bs, txn, &local_err); if (local_err != NULL) { error_propagate(errp, local_err); @@ -3399,6 +3405,7 @@ out: void qmp_blockdev_backup(const char *device, const char *target, enum MirrorSyncMode sync, bool has_speed, int64_t speed, + bool has_compress, bool compress, bool has_on_source_error, BlockdevOnError on_source_error, bool has_on_target_error, @@ -3406,6 +3413,7 @@ void qmp_blockdev_backup(const char *device, const char *target, Error **errp) { do_blockdev_backup(device, target, sync, has_speed, speed, + has_compress, compress, has_on_source_error, on_source_error, has_on_target_error, on_target_error, NULL, errp); diff --git a/qapi/block-core.json b/qapi/block-core.json index e54ceb2..f6a971c 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -926,6 +926,9 @@ # @speed: #optional the maximum speed, in bytes per second. The default is 0, # for unlimited. # +# @compress: #optional the compression data blocks (if the target format +# supports it; default: false). +# # @on-source-error: #optional the action to take on an error on the source, # default 'report'. 'stop' and 'enospc' can only be used # if the block device supports io-status (see BlockInfo). @@ -944,6 +947,7 @@ 'data': { 'device': 'str', 'target': 'str', 'sync': 'MirrorSyncMode', '*speed': 'int', + '*compress': 'bool', '*on-source-error': 'BlockdevOnError', '*on-target-error': 'BlockdevOnError' } } diff --git a/qmp-commands.hx b/qmp-commands.hx index ff927ae..19a0427 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1242,7 +1242,7 @@ EQMP { .name = "blockdev-backup", - .args_type = "sync:s,device:B,target:B,speed:i?," + .args_type = "sync:s,device:B,target:B,speed:i?,compress:b?," "on-source-error:s?,on-target-error:s?", .mhandler.cmd_new = qmp_marshal_blockdev_backup, }, @@ -1264,6 +1264,8 @@ Arguments: sectors allocated in the topmost image, or "none" to only replicate new I/O (MirrorSyncMode). - "speed": the maximum speed, in bytes per second (json-int, optional) +- "compress": the compression data blocks (if the target format supports it). + (json-bool, optional, default false) - "on-source-error": the action to take on an error on the source, default 'report'. 'stop' and 'enospc' can only be used if the block device supports io-status.