From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stj1h-0002Hs-5n for qemu-devel@nongnu.org; Tue, 24 Jul 2012 13:36:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Stj1c-0004dn-MF for qemu-devel@nongnu.org; Tue, 24 Jul 2012 13:36:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62797) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stj1c-0004dh-DQ for qemu-devel@nongnu.org; Tue, 24 Jul 2012 13:36:00 -0400 Date: Tue, 24 Jul 2012 14:36:26 -0300 From: Luiz Capitulino Message-ID: <20120724143626.10fc2d2c@doriath.home> In-Reply-To: <1343055415-24767-3-git-send-email-benoit@irqsave.net> References: <1343055415-24767-1-git-send-email-benoit@irqsave.net> <1343055415-24767-3-git-send-email-benoit@irqsave.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 2/3] block: Use file_ancestors_count() in qmp_query_block List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: benoit.canet@gmail.com Cc: kwolf@redhat.com, stefanha@linux.vnet.ibm.com, stefanha@gmail.com, qemu-devel@nongnu.org, pbonzini@redhat.com, =?ISO-8859-1?B?QmVub+50?= Canet On Mon, 23 Jul 2012 16:56:54 +0200 benoit.canet@gmail.com wrote: > From: Beno=EEt Canet >=20 > Use the dedicated counting function in qmp_query_block in order to > propagate the backing file count to HMP. >=20 > Signed-off-by: Benoit Canet > --- > block.c | 2 ++ > qapi-schema.json | 9 ++++++--- > 2 files changed, 8 insertions(+), 3 deletions(-) >=20 > diff --git a/block.c b/block.c > index 1128356..23b4aab 100644 > --- a/block.c > +++ b/block.c > @@ -2448,6 +2448,8 @@ BlockInfoList *qmp_query_block(Error **errp) > if (bs->backing_file[0]) { > info->value->inserted->has_backing_file =3D true; > info->value->inserted->backing_file =3D g_strdup(bs->bac= king_file); > + info->value->inserted->file_ancestors_count =3D > + bdrv_get_file_ancestors_count(bs); > } > =20 > if (bs->io_limits_enabled) { > diff --git a/qapi-schema.json b/qapi-schema.json > index a92adb1..1ae0fc7 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -398,6 +398,8 @@ > # > # @backing_file: #optional the name of the backing file (for copy-on-wri= te) > # > +# @file_ancestors_count: #optional the count of ancestors backing files = (for copy-on-write) > +# > # @encrypted: true if the backing device is encrypted > # > # @bps: total throughput limit in bytes per second is specified > @@ -418,9 +420,10 @@ > ## > { 'type': 'BlockDeviceInfo', > 'data': { 'file': 'str', 'ro': 'bool', 'drv': 'str', > - '*backing_file': 'str', 'encrypted': 'bool', > - 'bps': 'int', 'bps_rd': 'int', 'bps_wr': 'int', > - 'iops': 'int', 'iops_rd': 'int', 'iops_wr': 'int'} } > + '*backing_file': 'str', 'file_ancestors_count', 'int', Syntax error, it should be 'file_ancestors_count: int'. And, wouldn't be better to call it backing_file_ancestors_count? Otherwise the qmp part looks good to me. > + 'encrypted': 'bool', 'bps': 'int', 'bps_rd': 'int', > + 'bps_wr': 'int', 'iops': 'int', 'iops_rd': 'int', > + 'iops_wr': 'int'} } > =20 > ## > # @BlockDeviceIoStatus: