Received: from eggs.gnu.org ([140.186.70.92]:45723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKSiX-0001vt-MD for qemu-devel@nongnu.org; Sun, 30 Oct 2011 06:34:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RKSiV-0002Ra-Lk for qemu-devel@nongnu.org; Sun, 30 Oct 2011 06:34:17 -0400 Received: from e5.ny.us.ibm.com ([32.97.182.145]:47294) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKSiV-0002RV-Bg for qemu-devel@nongnu.org; Sun, 30 Oct 2011 06:34:15 -0400 Received: from /spool/local by e5.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 30 Oct 2011 06:34:10 -0400 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9UAY3ge285020 for ; Sun, 30 Oct 2011 06:34:07 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p9UAY3K8027648 for ; Sun, 30 Oct 2011 08:34:03 -0200 From: Supriya Kannery Date: Sun, 30 Oct 2011 16:03:54 +0530 Message-Id: <20111030103354.31685.6508.sendpatchset@skannery.in.ibm.com> In-Reply-To: <20111030103327.31685.17045.sendpatchset@skannery.in.ibm.com> References: <20111030103327.31685.17045.sendpatchset@skannery.in.ibm.com> Subject: [Qemu-devel] [v8 Patch 1/6]Qemu: Enhance "info block" to display host cache setting List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Christoph Hellwig Enhance "info block" to display hostcache setting for each block device. Example: (qemu) info block ide0-hd0: removable=0 file=../sles11-32.raw ro=0 drv=raw encrypted=0 Enhanced to display "hostcache" setting: (qemu) info block ide0-hd0: removable=0 hostcache=1 file=../sles11-32.raw ro=0 drv=raw encrypted=0 Signed-off-by: Supriya Kannery --- block.c | 20 ++++++++++++++++---- qmp-commands.hx | 2 ++ 2 files changed, 18 insertions(+), 4 deletions(-) Index: qemu/qmp-commands.hx =================================================================== --- qemu.orig/qmp-commands.hx +++ qemu/qmp-commands.hx @@ -1142,6 +1142,7 @@ Each json-object contain the following: - "locked": true if the device is locked, false otherwise (json-bool) - "tray-open": only present if removable, true if the device has a tray, and it is open (json-bool) +- "hostcache": true if host pagecache enabled, false otherwise (json-bool) - "inserted": only present if the device is inserted, it is a json-object containing the following: - "file": device file name (json-string) @@ -1168,6 +1169,7 @@ Example: "io-status": "ok", "device":"ide0-hd0", "locked":false, + "hostcache":false, "removable":false, "inserted":{ "ro":false, Index: qemu/block.c =================================================================== --- qemu.orig/block.c +++ qemu/block.c @@ -1841,6 +1841,11 @@ static void bdrv_print_dict(QObject *obj qdict_get_bool(bs_dict, "tray-open")); } + if (qdict_haskey(bs_dict, "hostcache")) { + monitor_printf(mon, " hostcache=%d", + qdict_get_bool(bs_dict, "hostcache")); + } + if (qdict_haskey(bs_dict, "io-status")) { monitor_printf(mon, " io-status=%s", qdict_get_str(bs_dict, "io-status")); } @@ -1888,10 +1893,12 @@ void bdrv_info(Monitor *mon, QObject **r QDict *bs_dict; bs_obj = qobject_from_jsonf("{ 'device': %s, 'type': 'unknown', " - "'removable': %i, 'locked': %i }", + "'removable': %i, 'locked': %i, " + "'hostcache': %i }", bs->device_name, bdrv_dev_has_removable_media(bs), - bdrv_dev_is_medium_locked(bs)); + bdrv_dev_is_medium_locked(bs), + !(bs->open_flags & BDRV_O_NOCACHE)); bs_dict = qobject_to_qdict(bs_obj); if (bdrv_dev_has_removable_media(bs)) {