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>
81 lines
2.5 KiB
C
81 lines
2.5 KiB
C
/*
|
|
* Copyright (C) 2010 Red Hat, Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 or
|
|
* (at your option) version 3 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef QEMU_SPICE_H
|
|
#define QEMU_SPICE_H
|
|
|
|
#ifdef CONFIG_SPICE
|
|
|
|
#include <spice.h>
|
|
|
|
#include "qemu-option.h"
|
|
#include "qemu-config.h"
|
|
#include "qemu-char.h"
|
|
#include "monitor.h"
|
|
|
|
extern int using_spice;
|
|
|
|
void qemu_spice_init(void);
|
|
void qemu_spice_input_init(void);
|
|
void qemu_spice_audio_init(void);
|
|
void qemu_spice_display_init(DisplayState *ds);
|
|
int qemu_spice_display_add_client(int csock, int skipauth, int tls);
|
|
int qemu_spice_add_interface(SpiceBaseInstance *sin);
|
|
int qemu_spice_set_passwd(const char *passwd,
|
|
bool fail_if_connected, bool disconnect_if_connected);
|
|
int qemu_spice_set_pw_expire(time_t expires);
|
|
int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,
|
|
const char *subject,
|
|
MonitorCompletion cb, void *opaque);
|
|
|
|
void do_info_spice_print(Monitor *mon, const QObject *data);
|
|
void do_info_spice(Monitor *mon, QObject **ret_data);
|
|
|
|
int qemu_chr_open_spice(QemuOpts *opts, CharDriverState **_chr);
|
|
|
|
#else /* CONFIG_SPICE */
|
|
#include "monitor.h"
|
|
|
|
#define using_spice 0
|
|
static inline int qemu_spice_set_passwd(const char *passwd,
|
|
bool fail_if_connected,
|
|
bool disconnect_if_connected)
|
|
{
|
|
return -1;
|
|
}
|
|
static inline int qemu_spice_set_pw_expire(time_t expires)
|
|
{
|
|
return -1;
|
|
}
|
|
static inline int qemu_spice_migrate_info(const char *h, int p, int t,
|
|
const char *s,
|
|
MonitorCompletion cb, void *opaque)
|
|
{
|
|
cb(opaque, NULL);
|
|
return -1;
|
|
}
|
|
|
|
static inline int qemu_spice_display_add_client(int csock, int skipauth,
|
|
int tls)
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
#endif /* CONFIG_SPICE */
|
|
|
|
#endif /* QEMU_SPICE_H */
|