path: root/qmp.c
diff options
authorLuiz Capitulino <lcapitulino@redhat.com>2011-10-17 16:41:22 -0200
committerLuiz Capitulino <lcapitulino@redhat.com>2011-10-27 11:48:47 -0200
commit2b54aa879ea8490e25107dfc51a6ee268c84c273 (patch)
tree06d458c2504dd1b92c93748d6ac8deeb18e4d0ea /qmp.c
parentbf82632841cd5cd9b4275913591efe4a2035b969 (diff)
qapi: Convert query-vnc
There are three important remarks in relation to the non-qapi command: 1. This commit also fixes the behavior of the 'query-vnc' and 'info vnc' commands to return an error when qemu is built without VNC support (ie. --disable-vnc). The non-qapi command would return the OK response in QMP and no response in HMP 2. The qapi version explicitly marks the fields 'host', 'family', 'service' and 'auth' as optional. Their are not documented as optional in the non-qapi command doc, but they would not be returned if vnc support is disabled. The qapi version maintains the same semantics, but documents those fields correctly 3. The 'clients' field, which is a list, is marked as optional but is always returned. If there are no clients connected an empty list is returned. This is not the Right Way to this in the qapi but it's how the non-qapi command used to work Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'qmp.c')
1 files changed, 10 insertions, 0 deletions
diff --git a/qmp.c b/qmp.c
index e84922bff..3a58cfe35 100644
--- a/qmp.c
+++ b/qmp.c
@@ -95,3 +95,13 @@ void qmp_cpu(int64_t index, Error **errp)
/* Just do nothing */
+#ifndef CONFIG_VNC
+/* If VNC support is enabled, the "true" query-vnc command is
+ defined in the VNC subsystem */
+VncInfo *qmp_query_vnc(Error **errp)
+ error_set(errp, QERR_FEATURE_DISABLED, "vnc");
+ return NULL;