Patchwork [V3,1/3] Enhance "info block" to display hostcache setting

login
register
mail settings
Submitter Supriya Kannery
Date June 17, 2011, 4:37 p.m.
Message ID <20110617163735.2933.67191.sendpatchset@skannery>
Download mbox | patch
Permalink /patch/100829/
State New
Headers show

Comments

Supriya Kannery - June 17, 2011, 4:37 p.m.
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 <supriyak@in.ibm.com>

---
 block.c         |   21 +++++++++++++++++----
 qmp-commands.hx |    2 ++
 2 files changed, 19 insertions(+), 4 deletions(-)
Kevin Wolf - June 20, 2011, 2:23 p.m.
Am 17.06.2011 18:37, schrieb Supriya Kannery:
> 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 <supriyak@in.ibm.com>
> 
> ---
>  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=false");
> +		else
> +			monitor_printf(mon, " hostcache=true");

Coding style requires braces.

> +	}
> +
>      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");

Don't use tabs.

Kevin
supriya kannery - June 22, 2011, 2:59 p.m.
On 06/20/2011 07:53 PM, Kevin Wolf wrote:
> Am 17.06.2011 18:37, schrieb Supriya Kannery:
>>
>> +		int open_flags = qdict_get_int(bs_dict, "open_flags");
>> +		if (open_flags&  BDRV_O_NOCACHE)
>> +			monitor_printf(mon, " hostcache=false");
>> +		else
>> +			monitor_printf(mon, " hostcache=true");
>
> Coding style requires braces.
>

Now realising that, by mistake I used checkpatch.pl in linux kernel tree 
instead of the one in qemu tree. Will resubmit this patchset after
checking using checkpatch.pl in qemu tree.

Patch

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=false");
+		else
+			monitor_printf(mon, " hostcache=true");
+	}
+
     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,