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

spice: move display_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-5-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2020-10-19 09:52:14 +02:00
parent 63be30e6d5
commit b192cd1e4f
5 changed files with 12 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

@ -20,6 +20,7 @@
struct QemuSpiceOps { struct QemuSpiceOps {
void (*init)(void); void (*init)(void);
void (*display_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);
}; };

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

@ -66,13 +66,6 @@ static inline int qemu_spice_display_add_client(int csock, int skipauth,
return -1; return -1;
} }
static inline void qemu_spice_display_init(void)
{
/* This must never be called if CONFIG_SPICE is disabled */
error_report("spice support is disabled");
abort();
}
#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

@ -4447,7 +4447,7 @@ void qemu_init(int argc, char **argv, char **envp)
#endif #endif
if (using_spice) { if (using_spice) {
qemu_spice_display_init(); qemu_spice.display_init();
} }
if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) { if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) {

1
ui/spice-core.c
View File

@ -995,6 +995,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, .init = qemu_spice_init,
.display_init = qemu_spice_display_init,
.migrate_info = qemu_spice_migrate_info, .migrate_info = qemu_spice_migrate_info,
}; };

9
ui/spice-module.c
View File

@ -18,6 +18,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "ui/qemu-spice-module.h" #include "ui/qemu-spice-module.h"
int using_spice; int using_spice;
@ -26,6 +27,13 @@ static void qemu_spice_init_stub(void)
{ {
} }
static void qemu_spice_display_init_stub(void)
{
/* This must never be called if CONFIG_SPICE is disabled */
error_report("spice support is disabled");
abort();
}
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)
{ {
@ -34,5 +42,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, .init = qemu_spice_init_stub,
.display_init = qemu_spice_display_init_stub,
.migrate_info = qemu_spice_migrate_info_stub, .migrate_info = qemu_spice_migrate_info_stub,
}; };