From patchwork Wed Jan 16 16:25:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Canet?= X-Patchwork-Id: 212824 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9D8A92C0040 for ; Thu, 17 Jan 2013 03:56:16 +1100 (EST) Received: from localhost ([::1]:55878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvWHe-000519-Pc for incoming@patchwork.ozlabs.org; Wed, 16 Jan 2013 11:56:14 -0500 Received: from eggs.gnu.org ([208.118.235.92]:42381) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVrk-00076v-N5 for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:29:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvVrc-0007ye-JO for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:29:28 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:43419 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVrc-0007yQ-9P for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:29:20 -0500 Received: by paradis.irqsave.net (Postfix, from userid 1002) id CF8198742F8; Wed, 16 Jan 2013 18:00:56 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id 9C6CB87435A; Wed, 16 Jan 2013 17:56:24 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 16 Jan 2013 17:25:18 +0100 Message-Id: <1358353518-5421-13-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1358353518-5421-1-git-send-email-benoit@irqsave.net> References: <1358353518-5421-1-git-send-email-benoit@irqsave.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 62.212.105.220 Cc: kwolf@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Subject: [Qemu-devel] [RFC V1 12/12] qmp: Add block_resume_dedup. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org --- blockdev.c | 18 ++++++++++++++++++ qapi-schema.json | 18 ++++++++++++++++++ qmp-commands.hx | 23 +++++++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/blockdev.c b/blockdev.c index 4c5f954..02b6535 100644 --- a/blockdev.c +++ b/blockdev.c @@ -914,6 +914,24 @@ void qmp_block_pause_dedup(const char *device, Error **errp) } } +void qmp_block_resume_dedup(const char *device, Error **errp) +{ + BlockDriverState *bs; + int err; + + bs = bdrv_find(device); + if (!bs) { + error_set(errp, QERR_DEVICE_NOT_FOUND, device); + return; + } + + err = bdrv_resume_dedup(bs); + if (err == -EINVAL) { + error_set(errp, QERR_DEVICE_NOT_DEDUPLICATED, bdrv_get_device_name(bs)); + return; + } +} + static void qmp_bdrv_open_encrypted(BlockDriverState *bs, const char *filename, int bdrv_flags, BlockDriver *drv, const char *password, Error **errp) diff --git a/qapi-schema.json b/qapi-schema.json index d8c8348..607f24b 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -738,6 +738,24 @@ { 'command': 'block-pause-dedup', 'data': {'device': 'str' } } ## +# @block-resume-dedup: +# +# This command resume the deduplication on a device that support it. +# +# @device: the name of the device to resume the deduplication on +# +# Returns: nothing on success +# If @device is not a valid block device, DeviceNotFound +# If @device is not deduplicated, DeviceNotDeduplicated +# +# Notes: Not all block formats support deduplication one must use +# query-blockstats before and look at the optional deduplication field. +# +# Since: 1.5 +## +{ 'command': 'block-resume-dedup', 'data': {'device': 'str' } } + +## # @BlockDeviceDedupInfo # # Statistics of the deduplication on a virtual block device implementing it diff --git a/qmp-commands.hx b/qmp-commands.hx index acc9fd0..d953847 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1259,6 +1259,29 @@ Example: EQMP { + .name = "block-resume-dedup", + .args_type = "device:B", + .mhandler.cmd_new = qmp_marshal_input_block_resume_dedup, + }, + +SQMP +block-resume-dedup +------------ + +Resume the deduplication on a device that support it. + +Arguments: + +- "device": device name (json-string) + +Example: + +-> { "execute": "block-resume-dedup", "arguments": { "device": "ide0-hd0" } } +<- { "return": {} } + +EQMP + + { .name = "block_set_io_throttle", .args_type = "device:B,bps:l,bps_rd:l,bps_wr:l,iops:l,iops_rd:l,iops_wr:l", .mhandler.cmd_new = qmp_marshal_input_block_set_io_throttle,