From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50066) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjRGp-0000Pf-Jz for qemu-devel@nongnu.org; Wed, 20 Jul 2011 03:32:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QjRGn-0007Uj-My for qemu-devel@nongnu.org; Wed, 20 Jul 2011 03:32:39 -0400 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:37044) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjRGn-0007UQ-2y for qemu-devel@nongnu.org; Wed, 20 Jul 2011 03:32:37 -0400 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [202.81.31.246]) by e23smtp07.au.ibm.com (8.14.4/8.13.1) with ESMTP id p6K7Q9Fn015896 for ; Wed, 20 Jul 2011 17:26:09 +1000 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p6K7Pdkj1040618 for ; Wed, 20 Jul 2011 17:25:39 +1000 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p6K7Q8Qc026324 for ; Wed, 20 Jul 2011 17:26:09 +1000 Message-ID: <4E2685C8.9050605@in.ibm.com> Date: Wed, 20 Jul 2011 13:07:44 +0530 From: Supriya Kannery MIME-Version: 1.0 References: <20110704104237.28170.97021.sendpatchset@skannery> <20110704104251.28170.3263.sendpatchset@skannery> <4E12EC54.4070505@in.ibm.com> In-Reply-To: <4E12EC54.4070505@in.ibm.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [V4 Patch 1/4 -Updated]Qemu: Enhance "info block" to display host cache setting List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: Kevin Wolf , Supriya Kannery , qemu-devel@nongnu.org, Christoph Hellwig On 07/05/2011 04:19 PM, Supriya Kannery wrote: > > Updated patch to display hostcache = 1/0 instead of true/false > in monitor. > > ------------------------------------------------------------------- > Enhance "info block" to display hostcache setting for each > block device. > > Example: > (qemu) info block > ide0-hd0: type=hd removable=0 file=../rhel6-32.qcow2 ro=0 drv=qcow2 > encrypted=0 > > Enhanced to display "hostcache" setting: > (qemu) info block > ide0-hd0: type=hd removable=0 hostcache=true file=../rhel6-32.qcow2 > ro=0 drv=qcow2 encrypted=0 > > Signed-off-by: Supriya Kannery > > --- > block.c | 21 +++++++++++++++++---- > qmp-commands.hx | 2 ++ > 2 files changed, 19 insertions(+), 4 deletions(-) > > Index: qemu/block.c > =================================================================== > --- qemu.orig/block.c > +++ qemu/block.c > @@ -1694,6 +1694,14 @@ static void bdrv_print_dict(QObject *obj > monitor_printf(mon, " locked=%d", qdict_get_bool(bs_dict, "locked")); > } > > + if (qdict_haskey(bs_dict, "open_flags")) { > + int open_flags = qdict_get_int(bs_dict, "open_flags"); > + if (open_flags & BDRV_O_NOCACHE) > + monitor_printf(mon, " hostcache=0"); > + else > + monitor_printf(mon, " hostcache=1"); > + } > + > if (qdict_haskey(bs_dict, "inserted")) { > QDict *qdict = qobject_to_qdict(qdict_get(bs_dict, "inserted")); > > @@ -1730,13 +1738,18 @@ void bdrv_info(Monitor *mon, QObject **r > QObject *bs_obj; > > bs_obj = qobject_from_jsonf("{ 'device': %s, 'type': 'unknown', " > - "'removable': %i, 'locked': %i }", > - bs->device_name, bs->removable, > - bs->locked); > + "'removable': %i, 'locked': %i, " > + "'hostcache': %s }", > + bs->device_name, bs->removable, > + bs->locked, > + (bs->open_flags & BDRV_O_NOCACHE) ? > + "false" : "true"); > + > + QDict *bs_dict = qobject_to_qdict(bs_obj); > + qdict_put(bs_dict, "open_flags", qint_from_int(bs->open_flags)); > > if (bs->drv) { > QObject *obj; > - QDict *bs_dict = qobject_to_qdict(bs_obj); > > obj = qobject_from_jsonf("{ 'file': %s, 'ro': %i, 'drv': %s, " > "'encrypted': %i }", > Index: qemu/qmp-commands.hx > =================================================================== > --- qemu.orig/qmp-commands.hx > +++ qemu/qmp-commands.hx > @@ -1070,6 +1070,7 @@ Each json-object contain the following: > - Possible values: "unknown" > - "removable": true if the device is removable, false otherwise (json-bool) > - "locked": true if the device is locked, false otherwise (json-bool) > +- "hostcache": true if hostcache 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) > @@ -1091,6 +1092,7 @@ Example: > { > "device":"ide0-hd0", > "locked":false, > + "hostcache":false, > "removable":false, > "inserted":{ > "ro":false, Pls review..