Patchwork [V4,1/4,-Updated] Qemu: Enhance "info block" to display host cache setting

login
register
mail settings
Submitter supriya kannery
Date July 5, 2011, 10:49 a.m.
Message ID <4E12EC54.4070505@in.ibm.com>
Download mbox | patch
Permalink /patch/103239/
State New
Headers show

Comments

supriya kannery - July 5, 2011, 10:49 a.m.
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 <supriyak@in.ibm.com>

---
  block.c         |   21 +++++++++++++++++----
  qmp-commands.hx |    2 ++
  2 files changed, 19 insertions(+), 4 deletions(-)

           - "file": device file name (json-string)
@@ -1091,6 +1092,7 @@ Example:
           {
              "device":"ide0-hd0",
              "locked":false,
+            "hostcache":false,
              "removable":false,
              "inserted":{
                 "ro":false,
supriya kannery - July 20, 2011, 7:37 a.m.
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 <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=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..

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=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: