From patchwork Wed Jul 25 08:11:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 173120 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F36B82C008D for ; Wed, 25 Jul 2012 18:12:09 +1000 (EST) Received: from localhost ([::1]:32917 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StwhT-00019M-VH for incoming@patchwork.ozlabs.org; Wed, 25 Jul 2012 04:12:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StwhI-00019E-7J for qemu-devel@nongnu.org; Wed, 25 Jul 2012 04:11:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1StwhG-0006Tx-N9 for qemu-devel@nongnu.org; Wed, 25 Jul 2012 04:11:56 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:37509) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StwhG-0006TO-GI for qemu-devel@nongnu.org; Wed, 25 Jul 2012 04:11:54 -0400 Received: by weyz53 with SMTP id z53so326176wey.4 for ; Wed, 25 Jul 2012 01:11:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=e6zwi0Ii2oIlcIaShoH9BzwPvJ0QRmg16xbbzGpqrxg=; b=e5rZ0cOuV6AlkrgdvxZffcNWtiE5LKp5VLuCzVVbkPdJ+8MU6KXlsIS5DzH3C8LRzg XQMLLLcTVAUjUBcpPwv53qpsZplO2gQC/uJiblM7EO5cW2v1x+eI2FysyHkOrSRbPGh9 E3wes8d3J8y+H1XjA4wSvw2JiFLPtXsUNMejpj38E8RVps8AoL7l8XaElnWWgXNbh1jx yNYHIGHUhVMrQrEOS70z27SQacp9S3Ytx3/JfziTNycR/bIM6BTC9ygPnmFy7VbUFC8f 7Cr3i90yABRF5Y9S//7JtnUIK0VJO57xxd0jqOgnjKOe5lyECFyuW/2ZyoE4pBRKCt+0 wIVg== Received: by 10.216.237.193 with SMTP id y43mr2351393weq.75.1343203913673; Wed, 25 Jul 2012 01:11:53 -0700 (PDT) Received: from Laure.box.in.irqsave.net (paradis.irqsave.net. [109.190.18.76]) by mx.google.com with ESMTPS id h9sm1420017wiz.1.2012.07.25.01.11.52 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 25 Jul 2012 01:11:53 -0700 (PDT) From: benoit.canet@gmail.com To: qemu-devel@nongnu.org Date: Wed, 25 Jul 2012 10:11:40 +0200 Message-Id: <1343203902-10524-3-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343203902-10524-1-git-send-email-benoit@irqsave.net> References: <1343203902-10524-1-git-send-email-benoit@irqsave.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.173 Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@gmail.com, lcapitulino@redhat.com, pbonzini@redhat.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH V2 2/3] block: Use bdrv_get_backing_file_ancestors_count() 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 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 03e0860..4aa3ea9 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->backing_file_ancestors_count = + bdrv_get_backing_file_ancestors_count(bs); } if (bs->io_limits_enabled) { diff --git a/qapi-schema.json b/qapi-schema.json index a92adb1..eb72c16 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_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', 'backing_file_ancestors_count': 'int', + 'encrypted': 'bool', 'bps': 'int', 'bps_rd': 'int', + 'bps_wr': 'int', 'iops': 'int', 'iops_rd': 'int', + 'iops_wr': 'int'} } ## # @BlockDeviceIoStatus: