From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59294) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StK4L-0008U5-3I for qemu-devel@nongnu.org; Mon, 23 Jul 2012 10:57:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1StK4F-0007yg-6l for qemu-devel@nongnu.org; Mon, 23 Jul 2012 10:57:09 -0400 Received: from mail-bk0-f45.google.com ([209.85.214.45]:40694) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StK4E-0007yF-Vc for qemu-devel@nongnu.org; Mon, 23 Jul 2012 10:57:03 -0400 Received: by mail-bk0-f45.google.com with SMTP id ji1so4546193bkc.4 for ; Mon, 23 Jul 2012 07:57:02 -0700 (PDT) From: benoit.canet@gmail.com Date: Mon, 23 Jul 2012 16:56:54 +0200 Message-Id: <1343055415-24767-3-git-send-email-benoit@irqsave.net> In-Reply-To: <1343055415-24767-1-git-send-email-benoit@irqsave.net> References: <1343055415-24767-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 2/3] block: Use file_ancestors_count() in qmp_query_block List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@gmail.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@linux.vnet.ibm.com, pbonzini@redhat.com From: Benoît Canet Use the dedicated counting function in qmp_query_block in order to propagate the backing file count to HMP. Signed-off-by: Benoit Canet --- block.c | 2 ++ qapi-schema.json | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) 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 = true; info->value->inserted->backing_file = g_strdup(bs->backing_file); + info->value->inserted->file_ancestors_count = + bdrv_get_file_ancestors_count(bs); } 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-write) # +# @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', + 'encrypted': 'bool', 'bps': 'int', 'bps_rd': 'int', + 'bps_wr': 'int', 'iops': 'int', 'iops_rd': 'int', + 'iops_wr': 'int'} } ## # @BlockDeviceIoStatus: -- 1.7.9.5