aboutsummaryrefslogtreecommitdiff
path: root/include/ui
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2020-10-19 09:52:16 +0200
committerGerd Hoffmann <kraxel@redhat.com>2020-10-21 15:46:14 +0200
commit08ad262643bb925e7f0437630f81b6d1f3acd936 (patch)
tree2673b8e9ce148a2087b2a4e68904affda6477fee /include/ui
parent05b53636d01c1c9b650465def20b683ea1382f63 (diff)
spice: move auth functions to QemuSpiceOps.
Move qemu_spice_set_passwd() and qemu_spice_set_pw_expire() functions to QemuSpiceOps. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-id: 20201019075224.14803-7-kraxel@redhat.com
Diffstat (limited to 'include/ui')
-rw-r--r--include/ui/qemu-spice-module.h3
-rw-r--r--include/ui/qemu-spice.h14
2 files changed, 3 insertions, 14 deletions
diff --git a/include/ui/qemu-spice-module.h b/include/ui/qemu-spice-module.h
index f93acde574..1ea3a999ce 100644
--- a/include/ui/qemu-spice-module.h
+++ b/include/ui/qemu-spice-module.h
@@ -26,6 +26,9 @@ struct QemuSpiceOps {
void (*init)(void);
void (*display_init)(void);
int (*migrate_info)(const char *h, int p, int t, const char *s);
+ int (*set_passwd)(const char *passwd,
+ bool fail_if_connected, bool disconnect_if_connected);
+ int (*set_pw_expire)(time_t expires);
#ifdef CONFIG_SPICE
int (*add_interface)(SpiceBaseInstance *sin);
#endif
diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
index 6018577c52..921b7a38d0 100644
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@ -31,9 +31,6 @@ 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_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);
@@ -48,17 +45,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_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_display_add_client(int csock, int skipauth,
int tls)
{