Re: [Qemu-devel] [PATCH 1/8] VNC: Use 'enabled' key instead of 'status'

[Anthony Liguori]

On 01/14/2010 10:50 AM, Luiz Capitulino wrote:

Currently the 'status' key is a string whose value can be
"disabled" or "enabled", change it to the QMP's standard
'enabled' key, which is a bool.

Note that 'status' in being dropped and this wouldn't be
allowed if QMP were stable.

Signed-off-by: Luiz Capitulino<lcapitul...@redhat.com>

Applied all.  Thanks.

Regards,

Anthony Liguori

---
  vnc.c |   10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/vnc.c b/vnc.c
index 58eac73..ef86ef7 100644
--- a/vnc.c
+++ b/vnc.c
@@ -254,7 +254,7 @@ void do_info_vnc_print(Monitor *mon, const QObject *data)
      QList *clients;

      server = qobject_to_qdict(data);
-    if (strcmp(qdict_get_str(server, "status"), "disabled") == 0) {
+    if (qdict_get_bool(server, "enabled") == 0) {
          monitor_printf(mon, "Server: disabled\n");
          return;
      }
@@ -282,7 +282,7 @@ void do_info_vnc_print(Monitor *mon, const QObject *data)
   *
   * The main QDict contains the following:
   *
- * - "status": "disabled" or "enabled"
+ * - "enabled": true or false
   * - "host": server's IP address
   * - "service": server's port number
   * - "auth": authentication method (optional)
@@ -297,13 +297,13 @@ void do_info_vnc_print(Monitor *mon, const QObject *data)
   *
   * Example:
   *
- * { "status": "enabled", "host": "0.0.0.0", "service": "50402", "auth": "vnc",
+ * { "enabled": true, "host": "0.0.0.0", "service": "50402", "auth": "vnc",
   *   "clients": [ { "host": "127.0.0.1", "service": "50401" } ] }
   */
  void do_info_vnc(Monitor *mon, QObject **ret_data)
  {
      if (vnc_display == NULL || vnc_display->display == NULL) {
-        *ret_data = qobject_from_jsonf("{ 'status': 'disabled' }");
+        *ret_data = qobject_from_jsonf("{ 'enabled': false }");
      } else {
          QDict *qdict;
          QList *clist;
@@ -319,7 +319,7 @@ void do_info_vnc(Monitor *mon, QObject **ret_data)
              }
          }

-        *ret_data = qobject_from_jsonf("{ 'status': 'enabled', 'clients': %p 
}",
+        *ret_data = qobject_from_jsonf("{ 'enabled': true, 'clients': %p }",
                                         QOBJECT(clist));
          assert(*ret_data != NULL);