From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5SIZ-0005WY-8z for qemu-devel@nongnu.org; Mon, 20 Jan 2014 22:46:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W5SIU-0001bq-6A for qemu-devel@nongnu.org; Mon, 20 Jan 2014 22:46:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54094) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5SIT-0001bm-UV for qemu-devel@nongnu.org; Mon, 20 Jan 2014 22:46:42 -0500 Date: Tue, 21 Jan 2014 11:46:37 +0800 From: Fam Zheng Message-ID: <20140121034637.GI29842@T430.redhat.com> References: <1386862440-8003-1-git-send-email-benoit@irqsave.net> <1386862440-8003-7-git-send-email-benoit@irqsave.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1386862440-8003-7-git-send-email-benoit@irqsave.net> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH V5 6/7] qmp: Allow block_resize to manipulate bs graph nodes. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-1?Q?Beno=EEt?= Canet Cc: kwolf@redhat.com, jcody@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, armbru@redhat.com On Thu, 12/12 16:33, Beno=EEt Canet wrote: > Signed-off-by: Benoit Canet > --- > blockdev.c | 18 ++++++++++++++---- > hmp.c | 2 +- > qapi-schema.json | 10 ++++++++-- > qmp-commands.hx | 3 ++- > 4 files changed, 25 insertions(+), 8 deletions(-) >=20 > diff --git a/blockdev.c b/blockdev.c > index ebb8f48..374d03d 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -1676,14 +1676,24 @@ int do_drive_del(Monitor *mon, const QDict *qdi= ct, QObject **ret_data) > return 0; > } > =20 > -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 =3D NULL; > BlockDriverState *bs; > int ret; > =20 > - bs =3D bdrv_find(device); > - if (!bs) { > - error_set(errp, QERR_DEVICE_NOT_FOUND, device); > + bs =3D 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; > + } > + > + if (!bdrv_is_first_non_filter(bs)) { > + error_set(errp, QERR_FEATURE_DISABLED, "resize"); > return; > } > =20 > 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 *qd= ict) > int64_t size =3D qdict_get_int(qdict, "size"); > Error *errp =3D NULL; > =20 > - qmp_block_resize(device, size, &errp); > + qmp_block_resize(true, device, false, NULL, size, &errp); > hmp_handle_error(mon, &errp); > } > =20 > diff --git a/qapi-schema.json b/qapi-schema.json > index 903fcb6..3977619 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -1722,7 +1722,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 (Sinc= e 2.0) > # > # @size: new image size in bytes > # > @@ -1731,7 +1735,9 @@ > # > # Since: 0.14.0 > ## > -{ 'command': 'block_resize', 'data': { 'device': 'str', 'size': 'int' = }} > +{ 'command': 'block_resize', 'data': { '*device': 'str', > + '*node-name': 'str', > + 'size': 'int' }} > =20 > ## > # @NewImageMode > diff --git a/qmp-commands.hx b/qmp-commands.hx > index 1451c1a..5696b08 100644 > --- a/qmp-commands.hx > +++ b/qmp-commands.hx > @@ -880,7 +880,7 @@ EQMP > =20 > { > .name =3D "block_resize", > - .args_type =3D "device:B,size:o", > + .args_type =3D "device:s?,node-name:s?,size:o", > .mhandler.cmd_new =3D qmp_marshal_input_block_resize, > }, > =20 > @@ -893,6 +893,7 @@ Resize a block image while a guest is running. > Arguments: > =20 > - "device": the device's ID, must be unique (json-string) > +- "node-name": the node name in the block driver state graph (json-str= ing) > - "size": new size > =20 > Example: > --=20 > 1.8.3.2 >=20 >=20 Reviewed-by: Fam Zheng