summaryrefslogtreecommitdiff
path: root/qmp-commands.hx
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2012-02-13 13:43:08 +0000
committerGerd Hoffmann <kraxel@redhat.com>2012-02-21 10:36:05 +0100
commitf1f5f4070ce2fc95f23e14d4f1e33ea75732af55 (patch)
treedd1197b0ffce3d5b2a175165335958ada0cd017b /qmp-commands.hx
parent2aa9e85c4634100cd10b1a052b0d6e22e1ce5911 (diff)
downloadqemu-f1f5f4070ce2fc95f23e14d4f1e33ea75732af55.tar.gz
qemu-f1f5f4070ce2fc95f23e14d4f1e33ea75732af55.tar.bz2
qemu-f1f5f4070ce2fc95f23e14d4f1e33ea75732af55.zip
Add SPICE support to add_client monitor command
With the acceptance of some new APIs to libspice-server.so it is possible to add support for SPICE to the 'add_client' monitor command, bringing parity with VNC. Since SPICE can use TLS or plain connections, the command also gains a new 'tls' parameter to specify whether TLS should be attempted on the injected client sockets. This new feature is only enabled if building against a libspice-server >= 0.10.1 * qmp-commands.hx: Add 'tls' parameter & missing doc for 'skipauth' parameter * monitor.c: Wire up SPICE for 'add_client' command * ui/qemu-spice.h, ui/spice-core.c: Add qemu_spice_display_add_client API to wire up from monitor [1] http://cgit.freedesktop.org/spice/spice/commit/server/spice.h?id=d55b68b6b44f2499278fa860fb47ff22f5011faa http://cgit.freedesktop.org/spice/spice/commit/server/spice.h?id=bd07dde530d9504e1cfe7ed5837fc00c26f36716 Changes in v3: - Added 'optional' flag to new parameters documented - Added no-op impl of qemu_spice_display_add_client when SPICE is disabled during build Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'qmp-commands.hx')
-rw-r--r--qmp-commands.hx6
1 files changed, 4 insertions, 2 deletions
diff --git a/qmp-commands.hx b/qmp-commands.hx
index b5e2ab8574..dee95f1d67 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -910,8 +910,8 @@ EQMP
{
.name = "add_client",
- .args_type = "protocol:s,fdname:s,skipauth:b?",
- .params = "protocol fdname skipauth",
+ .args_type = "protocol:s,fdname:s,skipauth:b?,tls:b?",
+ .params = "protocol fdname skipauth tls",
.help = "add a graphics client",
.user_print = monitor_user_noop,
.mhandler.cmd_new = add_graphics_client,
@@ -927,6 +927,8 @@ Arguments:
- "protocol": protocol name (json-string)
- "fdname": file descriptor name (json-string)
+- "skipauth": whether to skip authentication (json-bool, optional)
+- "tls": whether to perform TLS (json-bool, optional)
Example: