OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

spice: move display_add_client() to QemuSpiceOps.

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20201019075224.14803-8-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2020-10-19 09:52:17 +02:00
parent 08ad262643
commit 864a024c69
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/ui/qemu-spice-module.h
View File

@ -29,6 +29,7 @@ struct QemuSpiceOps {
int (*set_passwd)(const char *passwd,
bool fail_if_connected, bool disconnect_if_connected);
int (*set_pw_expire)(time_t expires);
int (*display_add_client)(int csock, int skipauth, int tls);
#ifdef CONFIG_SPICE
int (*add_interface)(SpiceBaseInstance *sin);
#endif

6
include/ui/qemu-spice.h
View File

@ -28,7 +28,6 @@
void qemu_spice_input_init(void);
void qemu_spice_display_init(void);
int qemu_spice_display_add_client(int csock, int skipauth, int tls);
bool qemu_spice_have_display_interface(QemuConsole *con);
int qemu_spice_add_display_interface(QXLInstance *qxlin, QemuConsole *con);
int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,
@ -45,11 +44,6 @@ int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,
#include "qemu/error-report.h"
#define spice_displays 0
static inline int qemu_spice_display_add_client(int csock, int skipauth,
int tls)
{
return -1;
}
#endif /* CONFIG_SPICE */

2
monitor/qmp-cmds.c
View File

@ -340,7 +340,7 @@ void qmp_add_client(const char *protocol, const char *fdname,
}
skipauth = has_skipauth ? skipauth : false;
tls = has_tls ? tls : false;
if (qemu_spice_display_add_client(fd, skipauth, tls) < 0) {
if (qemu_spice.display_add_client(fd, skipauth, tls) < 0) {
error_setg(errp, "spice failed to add client");
close(fd);
}

3
ui/spice-core.c
View File

@ -959,7 +959,7 @@ static int qemu_spice_set_pw_expire(time_t expires)
return qemu_spice_set_ticket(false, false);
}
int qemu_spice_display_add_client(int csock, int skipauth, int tls)
static int qemu_spice_display_add_client(int csock, int skipauth, int tls)
{
if (tls) {
return spice_server_add_ssl_client(spice_server, csock, skipauth);
@ -999,6 +999,7 @@ static struct QemuSpiceOps real_spice_ops = {
.migrate_info = qemu_spice_migrate_info,
.set_passwd = qemu_spice_set_passwd,
.set_pw_expire = qemu_spice_set_pw_expire,
.display_add_client = qemu_spice_display_add_client,
.add_interface = qemu_spice_add_interface,
};

7
ui/spice-module.c
View File

@ -52,10 +52,17 @@ static int qemu_spice_set_pw_expire_stub(time_t expires)
return -1;
}
static int qemu_spice_display_add_client_stub(int csock, int skipauth,
int tls)
{
return -1;
}
struct QemuSpiceOps qemu_spice = {
.init = qemu_spice_init_stub,
.display_init = qemu_spice_display_init_stub,
.migrate_info = qemu_spice_migrate_info_stub,
.set_passwd = qemu_spice_set_passwd_stub,
.set_pw_expire = qemu_spice_set_pw_expire_stub,
.display_add_client = qemu_spice_display_add_client_stub,
};