[Qemu-devel] [RFC 2/2] hmp/qxl: info spice: add qxl0_mode & qxl0_guest_bug

[Alon Levy <alevy@redhat.com>]

Signed-off-by: Alon Levy <alevy@redhat.com>
---
 hmp.c            |    7 +++++++
 hw/qxl.c         |   17 +++++++++++++++++
 qapi-schema.json |   32 ++++++++++++++++++++++++++++++--
 ui/qemu-spice.h  |    4 ++++
 ui/spice-core.c  |    3 +++
 5 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/hmp.c b/hmp.c
index 1f9fe0e..690da83 100644
--- a/hmp.c
+++ b/hmp.c
@@ -353,6 +353,13 @@ void hmp_info_spice(Monitor *mon)
     monitor_printf(mon, "  mouse-mode: %s\n",
                    SpiceQueryMouseMode_lookup[info->mouse_mode]);
 
+    if (info->qxl0_guest_bug != -1 && info->qxl0_mode != -1) {
+        monitor_printf(mon, " qxl0\n");
+        monitor_printf(mon, "   guest_bug: %"PRIu64"d\n", info->qxl0_guest_bug);
+        monitor_printf(mon, "        mode: %s\n",
+                SpiceQueryQXLMode_lookup[info->qxl0_mode]);
+    }
+
     if (!info->has_channels || info->channels == NULL) {
         monitor_printf(mon, "Channels: none\n");
     } else {
diff --git a/hw/qxl.c b/hw/qxl.c
index a9a7778..ddb1633 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1700,6 +1700,23 @@ static DisplayChangeListener display_listener = {
     .dpy_refresh = display_refresh,
 };
 
+/* helpers for spice_info. only show first device */
+int qxl0_guest_bug(void)
+{
+    if (!qxl0) {
+        return -1;
+    }
+    return qxl0->guest_bug;
+}
+
+int qxl0_mode(void)
+{
+    if (!qxl0) {
+        return -1;
+    }
+    return qxl0->mode;
+}
+
 static void qxl_init_ramsize(PCIQXLDevice *qxl, uint32_t ram_min_mb)
 {
     /* vga ram (bar 0) */
diff --git a/qapi-schema.json b/qapi-schema.json
index 4279259..edc958a 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -636,7 +636,7 @@
 ##
 # @SpiceQueryMouseMode
 #
-# An enumation of Spice mouse states.
+# An enumeration of Spice mouse states.
 #
 # @client: Mouse cursor position is determined by the client.
 #
@@ -653,6 +653,29 @@
   'data': [ 'client', 'server', 'unknown' ] }
 
 ##
+# @SpiceQueryQXLMode
+#
+# An enumeration of QXL States.
+#
+# @undefined: guest driver in control but no primary device. Reached after a destroy primary IO
+#             from native mode.
+#
+# @vga: no device driver in control. default mode, returns to it after any vga port access.
+#
+# @compat: No information is available about mouse mode used by
+#           the spice server.
+#
+# @native: guest driver in control of device. Reached after a create primary IO.
+#
+# Note: hw/qxl.h has a qxl_mode enum, name chose to not confuse the two.
+#
+# Since: 1.1
+##
+{ 'enum': 'SpiceQueryQXLMode',
+  'data': [ 'undefined', 'vga', 'compat', 'native' ] }
+
+
+##
 # @SpiceInfo
 #
 # Information about the SPICE session.
@@ -681,12 +704,17 @@
 #
 # @channels: a list of @SpiceChannel for each active spice channel
 #
+# @qxl0_mode: Mode of the primary qxl device.
+#
+# @qxl0_guest_bug: Guest bug status of primary qxl device.
+#
 # Since: 0.14.0
 ##
 { 'type': 'SpiceInfo',
   'data': {'enabled': 'bool', '*host': 'str', '*port': 'int',
            '*tls-port': 'int', '*auth': 'str', '*compiled-version': 'str',
-           'mouse-mode': 'SpiceQueryMouseMode', '*channels': ['SpiceChannel']} }
+           'mouse-mode': 'SpiceQueryMouseMode', '*channels': ['SpiceChannel'],
+           'qxl0_mode': 'SpiceQueryQXLMode', 'qxl0_guest_bug': 'int'} }
 
 ##
 # @query-spice
diff --git a/ui/qemu-spice.h b/ui/qemu-spice.h
index 3299da8..e2f894b 100644
--- a/ui/qemu-spice.h
+++ b/ui/qemu-spice.h
@@ -47,6 +47,10 @@ void do_info_spice(Monitor *mon, QObject **ret_data);
 
 CharDriverState *qemu_chr_open_spice(QemuOpts *opts);
 
+/* implemented in hw/qxl.c */
+int qxl0_guest_bug(void);
+int qxl0_mode(void);
+
 #else  /* CONFIG_SPICE */
 #include "monitor.h"
 
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 4fc48f8..5616fe6 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -453,6 +453,9 @@ SpiceInfo *qmp_query_spice(Error **errp)
              SPICE_SERVER_VERSION & 0xff);
     info->compiled_version = g_strdup(version_string);
 
+    info->qxl0_mode = qxl0_mode();
+    info->qxl0_guest_bug = qxl0_guest_bug();
+
     if (port) {
         info->has_port = true;
         info->port = port;
-- 
1.7.10.1