From patchwork Tue Dec 3 13:26:03 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: 296196 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AB42E2C007E for ; Wed, 4 Dec 2013 00:29:53 +1100 (EST) Received: from localhost ([::1]:42424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vnq2x-0007cs-2N for incoming@patchwork.ozlabs.org; Tue, 03 Dec 2013 08:29:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vnq0W-0003sJ-MP for qemu-devel@nongnu.org; Tue, 03 Dec 2013 08:27:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vnq0R-0005Yb-My for qemu-devel@nongnu.org; Tue, 03 Dec 2013 08:27:20 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:43057 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vnq0R-0005YU-8N for qemu-devel@nongnu.org; Tue, 03 Dec 2013 08:27:15 -0500 Received: by paradis.irqsave.net (Postfix, from userid 108) id 563F43FF56; Tue, 3 Dec 2013 14:31:07 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.2]) by paradis.irqsave.net (Postfix) with ESMTP id 1D9593FEFB; Tue, 3 Dec 2013 14:29:59 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Tue, 3 Dec 2013 14:26:03 +0100 Message-Id: <1386077165-19577-6-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1386077165-19577-1-git-send-email-benoit@irqsave.net> References: <1386077165-19577-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, famz@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , jcody@redhat.com, armbru@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [RFC V3 5/7] qmp: Allow block_resize to manipulate bs graph nodes. 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 Signed-off-by: Benoit Canet --- blockdev.c | 13 +++++++++---- hmp.c | 2 +- qapi-schema.json | 10 ++++++++-- qmp-commands.hx | 3 ++- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/blockdev.c b/blockdev.c index aab370f..e314d62 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1676,14 +1676,19 @@ int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data) return 0; } -void qmp_block_resize(const char *device, int64_t size, Error **errp) +void qmp_block_resize(bool has_device, const char * device, + bool has_node_name, const char * node_name, + int64_t size, Error **errp) { + Error *local_err = NULL; BlockDriverState *bs; int ret; - bs = bdrv_find(device); - if (!bs) { - error_set(errp, QERR_DEVICE_NOT_FOUND, device); + bs = bdrv_lookup_bs(has_device, device, + has_node_name, node_name, + &local_err); + if (error_is_set(&local_err)) { + error_propagate(errp, local_err); return; } diff --git a/hmp.c b/hmp.c index 3820fbe..906ddb7 100644 --- a/hmp.c +++ b/hmp.c @@ -892,7 +892,7 @@ void hmp_block_resize(Monitor *mon, const QDict *qdict) int64_t size = qdict_get_int(qdict, "size"); Error *errp = NULL; - qmp_block_resize(device, size, &errp); + qmp_block_resize(true, device, false, NULL, size, &errp); hmp_handle_error(mon, &errp); } diff --git a/qapi-schema.json b/qapi-schema.json index 60d3bd9..92a7768 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1721,7 +1721,11 @@ # # Resize a block image while a guest is running. # -# @device: the name of the device to get the image resized +# Either @device or @node-name must be set but not both. +# +# @device: #optional the name of the device to get the image resized +# +# @node-name: #optional graph node name to get the image resized (Since 1.8) # # @size: new image size in bytes # @@ -1730,7 +1734,9 @@ # # Since: 0.14.0 ## -{ 'command': 'block_resize', 'data': { 'device': 'str', 'size': 'int' }} +{ 'command': 'block_resize', 'data': { '*device': 'str', + '*node-name': 'str', + 'size': 'int' }} ## # @NewImageMode diff --git a/qmp-commands.hx b/qmp-commands.hx index a73b08f..6b309a1 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -880,7 +880,7 @@ EQMP { .name = "block_resize", - .args_type = "device:B,size:o", + .args_type = "device:s?,node-name:s?,size:o", .mhandler.cmd_new = qmp_marshal_input_block_resize, }, @@ -893,6 +893,7 @@ Resize a block image while a guest is running. Arguments: - "device": the device's ID, must be unique (json-string) +- "node-name": the node name in the block driver state graph (json-string) - "size": new size Example: