From patchwork Thu Jul 26 13:18:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 173438 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 8031E2C0089 for ; Thu, 26 Jul 2012 23:53:01 +1000 (EST) Received: from localhost ([::1]:45249 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SuNyT-0007uR-F5 for incoming@patchwork.ozlabs.org; Thu, 26 Jul 2012 09:19:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SuNxe-0005mn-Af for qemu-devel@nongnu.org; Thu, 26 Jul 2012 09:18:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SuNxW-00065a-Em for qemu-devel@nongnu.org; Thu, 26 Jul 2012 09:18:38 -0400 Received: from mail-bk0-f45.google.com ([209.85.214.45]:38205) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SuNxW-00064n-7P for qemu-devel@nongnu.org; Thu, 26 Jul 2012 09:18:30 -0400 Received: by mail-bk0-f45.google.com with SMTP id ji1so1039158bkc.4 for ; Thu, 26 Jul 2012 06:18:29 -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=k+UyF4cWZ8p0LZqM6THsDlDVW+b5kLhPHiGtmX924K8=; b=W2vCj0d+XYIKU4ZJ6bi+5cvHXmFP34ercI/v2TWjUuban93WqKdIdPpK+WzdsqI/0E RK5KCHzRpUSvGvmq9k31Zj4ytYPo61MYsrIEfOYdKMaPrApGunIlKFni65wXv5kXqOOf l7Y6n4N6scQGmOQIXxmRq7+MLnUqdbFSotu3j1JDwDus8Zm0qVyY/Z8NmbD0Y2T8GbBL AWCvoxtRBVgYd3AsDWce1NZytXYvKcDneFP73Mru4U8FGGDHjaaw9Z7XoP0P/ApRkatw F8XP8iUhBa6lbfqB0YsAMdY+YtCbwqI76rPLGNwjWxUWUGgFfJlvlRSmbgt78at4uWTP wsSg== Received: by 10.204.130.151 with SMTP id t23mr14048653bks.94.1343308709799; Thu, 26 Jul 2012 06:18:29 -0700 (PDT) Received: from Laure.box.in.irqsave.net (paradis.irqsave.net. [109.190.18.76]) by mx.google.com with ESMTPS id u8sm14577098bks.0.2012.07.26.06.18.28 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 06:18:29 -0700 (PDT) From: benoit.canet@gmail.com To: qemu-devel@nongnu.org Date: Thu, 26 Jul 2012 15:18:19 +0200 Message-Id: <1343308701-29632-3-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343308701-29632-1-git-send-email-benoit@irqsave.net> References: <1343308701-29632-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: 209.85.214.45 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 V5 2/4] 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 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..2b50f22 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: