diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2020-10-19 09:52:14 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2020-10-21 15:46:14 +0200 |
| commit | b192cd1e4f9321b74e1d8b13b94a239a4750abfb (patch) | |
| tree | 44814e1dd885c6ac5246100b003336e0cd480618 | |
| parent | 63be30e6d53e78bbe5e21cbf930014ef4844fb31 (diff) | |
| download | focaccia-qemu-b192cd1e4f9321b74e1d8b13b94a239a4750abfb.tar.gz focaccia-qemu-b192cd1e4f9321b74e1d8b13b94a239a4750abfb.zip | |
spice: move display_init() to QemuSpiceOps.
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
| -rw-r--r-- | include/ui/qemu-spice-module.h | 1 | ||||
| -rw-r--r-- | include/ui/qemu-spice.h | 7 | ||||
| -rw-r--r-- | softmmu/vl.c | 2 | ||||
| -rw-r--r-- | ui/spice-core.c | 1 | ||||
| -rw-r--r-- | ui/spice-module.c | 9 |
5 files changed, 12 insertions, 8 deletions
diff --git a/include/ui/qemu-spice-module.h b/include/ui/qemu-spice-module.h index b182bc4c21..dbe09035da 100644 --- a/include/ui/qemu-spice-module.h +++ b/include/ui/qemu-spice-module.h @@ -20,6 +20,7 @@ struct QemuSpiceOps { void (*init)(void); + void (*display_init)(void); int (*migrate_info)(const char *h, int p, int t, const char *s); }; diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h index e6df0a8715..a3fd1ea5ad 100644 --- a/include/ui/qemu-spice.h +++ b/include/ui/qemu-spice.h @@ -66,13 +66,6 @@ static inline int qemu_spice_display_add_client(int csock, int skipauth, 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 */ static inline bool qemu_using_spice(Error **errp) diff --git a/softmmu/vl.c b/softmmu/vl.c index 65c34a6b8a..8a06fe8bf7 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -4447,7 +4447,7 @@ void qemu_init(int argc, char **argv, char **envp) #endif if (using_spice) { - qemu_spice_display_init(); + qemu_spice.display_init(); } if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) { diff --git a/ui/spice-core.c b/ui/spice-core.c index 6ef66eb387..82d5dbda3e 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -995,6 +995,7 @@ int qemu_spice_display_is_running(SimpleSpiceDisplay *ssd) static struct QemuSpiceOps real_spice_ops = { .init = qemu_spice_init, + .display_init = qemu_spice_display_init, .migrate_info = qemu_spice_migrate_info, }; diff --git a/ui/spice-module.c b/ui/spice-module.c index a30fa452ea..56868aaffe 100644 --- a/ui/spice-module.c +++ b/ui/spice-module.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "ui/qemu-spice-module.h" 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, 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 = { .init = qemu_spice_init_stub, + .display_init = qemu_spice_display_init_stub, .migrate_info = qemu_spice_migrate_info_stub, }; |