[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/12] cocoa: switch over to new display registry
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 03/12] cocoa: switch over to new display registry |
Date: |
Wed, 21 Feb 2018 14:15:28 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
include/ui/console.h | 12 ------------
vl.c | 3 ---
ui/cocoa.m | 14 +++++++++++++-
3 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index 82bbea0242..b97d9ccae4 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -441,18 +441,6 @@ void qemu_display_register(QemuDisplay *ui);
void qemu_display_early_init(DisplayOptions *opts);
void qemu_display_init(DisplayState *ds, DisplayOptions *opts);
-/* cocoa.m */
-#ifdef CONFIG_COCOA
-void cocoa_display_init(DisplayState *ds, DisplayOptions *opts);
-#else
-static inline void cocoa_display_init(DisplayState *ds, DisplayOptions *opts)
-{
- /* This must never be called if CONFIG_COCOA is disabled */
- error_report("Cocoa support is disabled");
- abort();
-}
-#endif
-
/* vnc.c */
void vnc_display_init(const char *id);
void vnc_display_open(const char *id, Error **errp);
diff --git a/vl.c b/vl.c
index 45900ba7e6..2c3cb4651c 100644
--- a/vl.c
+++ b/vl.c
@@ -4654,9 +4654,6 @@ int main(int argc, char **argv, char **envp)
case DISPLAY_TYPE_CURSES:
curses_display_init(ds, &dpy);
break;
- case DISPLAY_TYPE_COCOA:
- cocoa_display_init(ds, &dpy);
- break;
default:
qemu_display_init(ds, &dpy);
break;
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 90d9aa57ea..8b0dce90cb 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -1683,7 +1683,7 @@ static void addRemovableDevicesMenuItems(void)
qapi_free_BlockInfoList(pointerToFree);
}
-void cocoa_display_init(DisplayState *ds, DisplayOptions *opts)
+static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts)
{
COCOA_DEBUG("qemu_cocoa: cocoa_display_init\n");
@@ -1713,3 +1713,15 @@ void cocoa_display_init(DisplayState *ds, DisplayOptions
*opts)
*/
addRemovableDevicesMenuItems();
}
+
+static QemuDisplay qemu_display_cocoa = {
+ .type = DISPLAY_TYPE_COCOA,
+ .init = cocoa_display_init,
+};
+
+static void register_cocoa(void)
+{
+ qemu_display_register(&qemu_display_cocoa);
+}
+
+type_init(register_cocoa);
--
2.9.3
- [Qemu-devel] [PATCH 00/12] ui: build sdl, gtk and curses as modules, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 08/12] configure: add X11 vars to config-host.mak, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 12/12] curses: build as ui module, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 06/12] console: add and use qemu_display_find_default, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 09/12] configure: opengl doesn't depend on x11, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 02/12] sdl: switch over to new display registry, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 04/12] curses: switch over to new display registry, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 03/12] cocoa: switch over to new display registry,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 01/12] console: add qemu display registry, add gtk, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 11/12] gtk: build as ui module, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 05/12] egl-headless: switch over to new display registry, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 07/12] console: add ui module loading support, Gerd Hoffmann, 2018/02/21
- [Qemu-devel] [PATCH 10/12] sdl: build as ui module, Gerd Hoffmann, 2018/02/21