mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spice: move qemu_spice_init() 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-4-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2020-10-19 09:52:13 +02:00
parent 7477477ca7
commit 63be30e6d5
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@
#define QEMU_SPICE_MODULE_H #define QEMU_SPICE_MODULE_H
struct QemuSpiceOps { struct QemuSpiceOps {
void (*init)(void);
int (*migrate_info)(const char *h, int p, int t, const char *s); int (*migrate_info)(const char *h, int p, int t, const char *s);
}; };

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

@ -26,7 +26,6 @@
#include <spice.h> #include <spice.h>
#include "qemu/config-file.h" #include "qemu/config-file.h"
void qemu_spice_init(void);
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); int qemu_spice_display_add_client(int csock, int skipauth, int tls);
@ -74,10 +73,6 @@ static inline void qemu_spice_display_init(void)
abort(); abort();
} }
static inline void qemu_spice_init(void)
{
}
#endif /* CONFIG_SPICE */ #endif /* CONFIG_SPICE */
static inline bool qemu_using_spice(Error **errp) static inline bool qemu_using_spice(Error **errp)

2
softmmu/vl.c
View File

@ -4151,7 +4151,7 @@ void qemu_init(int argc, char **argv, char **envp)
/* spice needs the timers to be initialized by this point */ /* spice needs the timers to be initialized by this point */
/* spice must initialize before audio as it changes the default auiodev */ /* spice must initialize before audio as it changes the default auiodev */
/* spice must initialize before chardevs (for spicevmc and spiceport) */ /* spice must initialize before chardevs (for spicevmc and spiceport) */
qemu_spice_init(); qemu_spice.init();
qemu_opts_foreach(qemu_find_opts("chardev"), qemu_opts_foreach(qemu_find_opts("chardev"),
chardev_init_func, NULL, &error_fatal); chardev_init_func, NULL, &error_fatal);

3
ui/spice-core.c
View File

@ -633,7 +633,7 @@ static void vm_change_state_handler(void *opaque, int running,
} }
} }
void qemu_spice_init(void) static void qemu_spice_init(void)
{ {
QemuOpts *opts = QTAILQ_FIRST(&qemu_spice_opts.head); QemuOpts *opts = QTAILQ_FIRST(&qemu_spice_opts.head);
const char *password, *str, *x509_dir, *addr, const char *password, *str, *x509_dir, *addr,
@ -994,6 +994,7 @@ int qemu_spice_display_is_running(SimpleSpiceDisplay *ssd)
} }
static struct QemuSpiceOps real_spice_ops = { static struct QemuSpiceOps real_spice_ops = {
.init = qemu_spice_init,
.migrate_info = qemu_spice_migrate_info, .migrate_info = qemu_spice_migrate_info,
}; };

5
ui/spice-module.c
View File

@ -22,6 +22,10 @@
int using_spice; int using_spice;
static void qemu_spice_init_stub(void)
{
}
static int qemu_spice_migrate_info_stub(const char *h, int p, int t, static int qemu_spice_migrate_info_stub(const char *h, int p, int t,
const char *s) const char *s)
{ {
@ -29,5 +33,6 @@ static int qemu_spice_migrate_info_stub(const char *h, int p, int t,
} }
struct QemuSpiceOps qemu_spice = { struct QemuSpiceOps qemu_spice = {
.init = qemu_spice_init_stub,
.migrate_info = qemu_spice_migrate_info_stub, .migrate_info = qemu_spice_migrate_info_stub,
}; };