From patchwork Fri Sep 2 15:01:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Daniel P. Berrange" X-Patchwork-Id: 113157 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5B6B6B6F71 for ; Sat, 3 Sep 2011 01:02:17 +1000 (EST) Received: from localhost ([::1]:36316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzVFy-0005Gp-UH for incoming@patchwork.ozlabs.org; Fri, 02 Sep 2011 11:02:10 -0400 Received: from eggs.gnu.org ([140.186.70.92]:42099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzVFq-0005GV-Vq for qemu-devel@nongnu.org; Fri, 02 Sep 2011 11:02:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QzVFp-0002gU-PH for qemu-devel@nongnu.org; Fri, 02 Sep 2011 11:02:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38710) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzVFp-0002fl-DO for qemu-devel@nongnu.org; Fri, 02 Sep 2011 11:02:01 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p82F1qnZ016869 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 2 Sep 2011 11:01:52 -0400 Received: from acer1810.home.berrange.com.com (dhcp-1-152.lcy.redhat.com [10.32.224.152]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p82F1oTx026395; Fri, 2 Sep 2011 11:01:51 -0400 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Fri, 2 Sep 2011 16:01:40 +0100 Message-Id: <1314975700-20235-1-git-send-email-dan@berrange.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: "Daniel P. Berrange" Subject: [Qemu-devel] [PATCH] Display sector count in 'info block' output 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: "Daniel P. Berrange" To aid in knowing whether a 'block_resize' was succesful, display the sector count in the 'info block' output Signed-off-by: Daniel P. Berrange --- block.c | 6 ++++-- qmp-commands.hx | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 03a21d8..fdb0665 100644 --- a/block.c +++ b/block.c @@ -1844,6 +1844,7 @@ static void bdrv_print_dict(QObject *obj, void *opaque) monitor_printf(mon, " file="); monitor_print_filename(mon, qdict_get_str(qdict, "file")); + monitor_printf(mon, " sectors=%" PRId64, qdict_get_int(qdict, "sectors")); if (qdict_haskey(qdict, "backing_file")) { monitor_printf(mon, " backing_file="); monitor_print_filename(mon, qdict_get_str(qdict, "backing_file")); @@ -1884,10 +1885,11 @@ void bdrv_info(Monitor *mon, QObject **ret_data) QDict *bs_dict = qobject_to_qdict(bs_obj); obj = qobject_from_jsonf("{ 'file': %s, 'ro': %i, 'drv': %s, " - "'encrypted': %i }", + "'encrypted': %i, 'sectors': %" PRId64 " }", bs->filename, bs->read_only, bs->drv->format_name, - bdrv_is_encrypted(bs)); + bdrv_is_encrypted(bs), + bs->total_sectors); if (bs->backing_file[0] != '\0') { QDict *qdict = qobject_to_qdict(obj); qdict_put(qdict, "backing_file", diff --git a/qmp-commands.hx b/qmp-commands.hx index 27cc66e..07a20ff 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1134,6 +1134,7 @@ Each json-object contain the following: - "inserted": only present if the device is inserted, it is a json-object containing the following: - "file": device file name (json-string) + - "sectors": total sector count (json-int) - "ro": true if read-only, false otherwise (json-bool) - "drv": driver format name (json-string) - Possible values: "blkdebug", "bochs", "cloop", "cow", "dmg",