mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-15 07:22:46 +00:00
spice: move display_add_client() to QemuSpiceOps.
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:
parent
08ad262643
commit
864a024c69
|
@ -29,6 +29,7 @@ struct QemuSpiceOps {
|
||||||
int (*set_passwd)(const char *passwd,
|
int (*set_passwd)(const char *passwd,
|
||||||
bool fail_if_connected, bool disconnect_if_connected);
|
bool fail_if_connected, bool disconnect_if_connected);
|
||||||
int (*set_pw_expire)(time_t expires);
|
int (*set_pw_expire)(time_t expires);
|
||||||
|
int (*display_add_client)(int csock, int skipauth, int tls);
|
||||||
#ifdef CONFIG_SPICE
|
#ifdef CONFIG_SPICE
|
||||||
int (*add_interface)(SpiceBaseInstance *sin);
|
int (*add_interface)(SpiceBaseInstance *sin);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
|
|
||||||
void qemu_spice_input_init(void);
|
void qemu_spice_input_init(void);
|
||||||
void qemu_spice_display_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);
|
bool qemu_spice_have_display_interface(QemuConsole *con);
|
||||||
int qemu_spice_add_display_interface(QXLInstance *qxlin, 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,
|
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"
|
#include "qemu/error-report.h"
|
||||||
|
|
||||||
#define spice_displays 0
|
#define spice_displays 0
|
||||||
static inline int qemu_spice_display_add_client(int csock, int skipauth,
|
|
||||||
int tls)
|
|
||||||
{
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* CONFIG_SPICE */
|
#endif /* CONFIG_SPICE */
|
||||||
|
|
||||||
|
|
|
@ -340,7 +340,7 @@ void qmp_add_client(const char *protocol, const char *fdname,
|
||||||
}
|
}
|
||||||
skipauth = has_skipauth ? skipauth : false;
|
skipauth = has_skipauth ? skipauth : false;
|
||||||
tls = has_tls ? tls : 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");
|
error_setg(errp, "spice failed to add client");
|
||||||
close(fd);
|
close(fd);
|
||||||
}
|
}
|
||||||
|
|
|
@ -959,7 +959,7 @@ static int qemu_spice_set_pw_expire(time_t expires)
|
||||||
return qemu_spice_set_ticket(false, false);
|
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) {
|
if (tls) {
|
||||||
return spice_server_add_ssl_client(spice_server, csock, skipauth);
|
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,
|
.migrate_info = qemu_spice_migrate_info,
|
||||||
.set_passwd = qemu_spice_set_passwd,
|
.set_passwd = qemu_spice_set_passwd,
|
||||||
.set_pw_expire = qemu_spice_set_pw_expire,
|
.set_pw_expire = qemu_spice_set_pw_expire,
|
||||||
|
.display_add_client = qemu_spice_display_add_client,
|
||||||
.add_interface = qemu_spice_add_interface,
|
.add_interface = qemu_spice_add_interface,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -52,10 +52,17 @@ static int qemu_spice_set_pw_expire_stub(time_t expires)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int qemu_spice_display_add_client_stub(int csock, int skipauth,
|
||||||
|
int tls)
|
||||||
|
{
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
struct QemuSpiceOps qemu_spice = {
|
struct QemuSpiceOps qemu_spice = {
|
||||||
.init = qemu_spice_init_stub,
|
.init = qemu_spice_init_stub,
|
||||||
.display_init = qemu_spice_display_init_stub,
|
.display_init = qemu_spice_display_init_stub,
|
||||||
.migrate_info = qemu_spice_migrate_info_stub,
|
.migrate_info = qemu_spice_migrate_info_stub,
|
||||||
.set_passwd = qemu_spice_set_passwd_stub,
|
.set_passwd = qemu_spice_set_passwd_stub,
|
||||||
.set_pw_expire = qemu_spice_set_pw_expire_stub,
|
.set_pw_expire = qemu_spice_set_pw_expire_stub,
|
||||||
|
.display_add_client = qemu_spice_display_add_client_stub,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue