From patchwork Thu Aug 2 08:22:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 174701 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 32A632C0088 for ; Thu, 2 Aug 2012 18:23:44 +1000 (EST) Received: from localhost ([::1]:57937 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Swqh4-0007rI-7U for incoming@patchwork.ozlabs.org; Thu, 02 Aug 2012 04:23:42 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwqgT-0006dU-Vk for qemu-devel@nongnu.org; Thu, 02 Aug 2012 04:23:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwqgM-0002Te-5a for qemu-devel@nongnu.org; Thu, 02 Aug 2012 04:23:05 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:56408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwqgL-0002Ta-VH for qemu-devel@nongnu.org; Thu, 02 Aug 2012 04:22:58 -0400 Received: by weyz53 with SMTP id z53so5625421wey.4 for ; Thu, 02 Aug 2012 01:22:57 -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; bh=+62ue5ZeyPAR8EuF2KVL422kLVlFEhy280VHY2dauBU=; b=At67u3B/LjnIwEoIGBafYLDR2DJ8sr2PHhI0Ia5GDMLggVjmHkr6+K0RrzAdCYzWtI JbokHJSMlZDpZ0XgOKwS/ECDpMlBy75g18uTpAL2NkrTaehdu54z7PCvHWJSdfVfWAny M9QcFNzpMNOfOaQ0AiXxoGjzXby8ixQqVeJtaO5adW7sGiklc2eALVAMBKLLxLVpaN1Q 4maV9d+85DkRUW3wOa4K8fybbKR4w6sSj4a7Tye/VNHLMMNheFB2w2BiGr2x92Ow2917 n6m/RTAiGODkW+feTgcb1XbMNFBkkP7yJqR6a8Wq9/bsz7FQHFy0uYDXY6K0EAYQtKAv ri3w== Received: by 10.180.91.1 with SMTP id ca1mr2694166wib.8.1343895777128; Thu, 02 Aug 2012 01:22:57 -0700 (PDT) Received: from Laure.box.in.irqsave.net (paradis.irqsave.net. [109.190.18.76]) by mx.google.com with ESMTPS id ck9sm15545082wib.2.2012.08.02.01.22.55 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 02 Aug 2012 01:22:56 -0700 (PDT) From: "=?UTF-8?q?Beno=C3=AEt=20Canet?=" To: qemu-devel@nongnu.org Date: Thu, 2 Aug 2012 10:22:48 +0200 Message-Id: <1343895769-21255-3-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343895769-21255-1-git-send-email-benoit@irqsave.net> References: <1343895769-21255-1-git-send-email-benoit@irqsave.net> 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?= , lcapitulino@redhat.com, pbonzini@redhat.com, eblake@redhat.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH V6 2/3] block: Use bdrv_get_backing_file_depth() 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 Use the dedicated counting function in qmp_query_block in order to propagate the backing file depth to HMP and add backing_file_depth to qmp-commands.hx Signed-off-by: Benoit Canet --- block.c | 3 +++ qapi-schema.json | 9 ++++++--- qmp-commands.hx | 2 ++ 3 files changed, 11 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..a31d807 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: number of files in the backing file chain (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: diff --git a/qmp-commands.hx b/qmp-commands.hx index e3cf3c5..ac46638 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1317,6 +1317,7 @@ Each json-object contain the following: "nbd", "parallels", "qcow", "qcow2", "raw", "tftp", "vdi", "vmdk", "vpc", "vvfat" - "backing_file": backing file name (json-string, optional) + - "backing_file_depth": number of files in the backing file chain (json-int) - "encrypted": true if encrypted, false otherwise (json-bool) - "bps": limit total bytes per second (json-int) - "bps_rd": limit read bytes per second (json-int) @@ -1345,6 +1346,7 @@ Example: "drv":"qcow2", "encrypted":false, "file":"disks/test.img", + "backing_file_depth":0, "bps":1000000, "bps_rd":0, "bps_wr":0,