From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bK2zu-00030n-7Z for qemu-devel@nongnu.org; Mon, 04 Jul 2016 08:29:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bK2zr-0005wv-K3 for qemu-devel@nongnu.org; Mon, 04 Jul 2016 08:29:09 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:17591 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bK2zr-0005wZ-5h for qemu-devel@nongnu.org; Mon, 04 Jul 2016 08:29:07 -0400 From: "Denis V. Lunev" Date: Mon, 4 Jul 2016 15:28:24 +0300 Message-Id: <1467635306-31875-14-git-send-email-den@openvz.org> In-Reply-To: <1467635306-31875-1-git-send-email-den@openvz.org> References: <1467635306-31875-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH v5 13/15] blockdev-backup: added support for data compression List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org, qemu-devel@nongnu.org Cc: den@openvz.org, Pavel Butsykin , Jeff Cody , Markus Armbruster , Eric Blake , John Snow , Stefan Hajnoczi , Kevin Wolf 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 Reviewed-by: Stefan Hajnoczi Signed-off-by: Denis V. Lunev CC: Jeff Cody CC: Markus Armbruster CC: Eric Blake CC: John Snow CC: Stefan Hajnoczi CC: Kevin Wolf --- blockdev.c | 9 ++++++--- qapi/block-core.json | 4 ++++ qmp-commands.hx | 4 +++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/blockdev.c b/blockdev.c index fa88900..279af57 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3277,6 +3277,9 @@ void do_blockdev_backup(BlockdevBackup *backup, BlockJobTxn *txn, Error **errp) if (!backup->has_on_target_error) { backup->on_target_error = BLOCKDEV_ON_ERROR_REPORT; } + if (!backup->has_compress) { + backup->compress = false; + } blk = blk_by_name(backup->device); if (!blk) { @@ -3309,9 +3312,9 @@ void do_blockdev_backup(BlockdevBackup *backup, BlockJobTxn *txn, Error **errp) goto out; } } - backup_start(bs, target_bs, backup->speed, backup->sync, NULL, false, - backup->on_source_error, backup->on_target_error, block_job_cb, - bs, txn, &local_err); + backup_start(bs, target_bs, backup->speed, backup->sync, NULL, + backup->compress, backup->on_source_error, + backup->on_target_error, block_job_cb, bs, txn, &local_err); if (local_err != NULL) { error_propagate(errp, local_err); } diff --git a/qapi/block-core.json b/qapi/block-core.json index 0cbad5a..386c7ff 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 true to compress data, if the target format supports it. +# (default: false) (since 2.7) +# # @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 810d0fe..2cf6e1f 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1269,7 +1269,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, }, @@ -1291,6 +1291,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": true to compress data, 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. -- 2.1.4