From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55480) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SuM3M-0000ON-Jy for qemu-devel@nongnu.org; Thu, 26 Jul 2012 07:16:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SuM3D-0003cq-Pc for qemu-devel@nongnu.org; Thu, 26 Jul 2012 07:16:24 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:49779) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SuM3D-0003cj-JU for qemu-devel@nongnu.org; Thu, 26 Jul 2012 07:16:15 -0400 Received: by weyz53 with SMTP id z53so1256166wey.4 for ; Thu, 26 Jul 2012 04:16:15 -0700 (PDT) From: benoit.canet@gmail.com Date: Thu, 26 Jul 2012 13:16:05 +0200 Message-Id: <1343301366-18028-3-git-send-email-benoit@irqsave.net> In-Reply-To: <1343301366-18028-1-git-send-email-benoit@irqsave.net> References: <1343301366-18028-1-git-send-email-benoit@irqsave.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH V4 2/3] block: Use bdrv_get_backing_file_depth() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , lcapitulino@redhat.com, pbonzini@redhat.com, eblake@redhat.com, stefanha@linux.vnet.ibm.com From: Benoît Canet Use the dedicated counting function in qmp_query_block in order to propagate the backing file depth to HMP. Signed-off-by: Benoit Canet --- block.c | 3 +++ qapi-schema.json | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index 22ebe49..a6fba1d 100644 --- a/block.c +++ b/block.c @@ -2450,6 +2450,9 @@ BlockInfoList *qmp_query_block(Error **errp) info->value->inserted->backing_file = g_strdup(bs->backing_file); } + info->value->inserted->backing_file_depth = + bdrv_get_backing_file_depth(bs); + if (bs->io_limits_enabled) { info->value->inserted->bps = bs->io_limits.bps[BLOCK_IO_LIMIT_TOTAL]; diff --git a/qapi-schema.json b/qapi-schema.json index a92adb1..70a17fb 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-write) # +# @backing-file-depth: the count of ancestor's backing files (since: 1.2) +# # @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', 'backing-file-depth': 'int', + 'encrypted': 'bool', 'bps': 'int', 'bps_rd': 'int', + 'bps_wr': 'int', 'iops': 'int', 'iops_rd': 'int', + 'iops_wr': 'int'} } ## # @BlockDeviceIoStatus: -- 1.7.9.5