summary refs log tree commit diff stats
path: root/include
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2020-10-19 09:52:14 +0200
committerGerd Hoffmann <kraxel@redhat.com>2020-10-21 15:46:14 +0200
commitb192cd1e4f9321b74e1d8b13b94a239a4750abfb (patch)
tree44814e1dd885c6ac5246100b003336e0cd480618 /include
parent63be30e6d53e78bbe5e21cbf930014ef4844fb31 (diff)
downloadfocaccia-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
Diffstat (limited to 'include')
-rw-r--r--include/ui/qemu-spice-module.h1
-rw-r--r--include/ui/qemu-spice.h7
2 files changed, 1 insertions, 7 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)