From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 25 Jan 2013 11:56:48 +0000 (+0100)
Subject: qemu_monitor: Fix tray-open attribute in query-block
X-Git-Tag: v1.0.2-rc2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=319ed26437b731bdf5d568c2c5605550a4487be3;p=thirdparty%2Flibvirt.git

qemu_monitor: Fix tray-open attribute in query-block

With our code, we fail to query for tray-open attribute currently.
That's because in HMP it is 'tray-open' and in QMP it's 'tray_open'.
It always has been. However, we got it exactly the opposite.
---

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index de5f1155e8..2d2a5d0450 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -1585,10 +1585,10 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon,
             goto cleanup;
         }
 
-        /* Don't check for success here, because 'tray-open' is presented iff
+        /* Don't check for success here, because 'tray_open' is presented iff
          * medium is ejected.
          */
-        ignore_value(virJSONValueObjectGetBoolean(dev, "tray-open",
+        ignore_value(virJSONValueObjectGetBoolean(dev, "tray_open",
                                                   &info->tray_open));
 
         /* Missing io-status indicates no error */
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index 6506f9da1b..bc0a11dc4d 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -809,10 +809,10 @@ int qemuMonitorTextGetBlockInfo(qemuMonitorPtr mon,
                         VIR_DEBUG("error reading locked: %s", p);
                     else
                         info->locked = (tmp != 0);
-                } else if (STRPREFIX(p, "tray_open=")) {
-                    p += strlen("tray_open=");
+                } else if (STRPREFIX(p, "tray-open=")) {
+                    p += strlen("tray-open=");
                     if (virStrToLong_i(p, &dummy, 10, &tmp) == -1)
-                        VIR_DEBUG("error reading tray_open: %s", p);
+                        VIR_DEBUG("error reading tray-open: %s", p);
                     else
                         info->tray_open = (tmp != 0);
                 } else if (STRPREFIX(p, "io-status=")) {