[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/24] cocoa: hook up to display registry
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 16/24] cocoa: hook up to display registry |
Date: |
Fri, 17 Nov 2017 11:30:38 +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 63534ac20a..81db3a0f67 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -445,18 +445,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 474d982da9..d57671b755 100644
--- a/vl.c
+++ b/vl.c
@@ -4773,9 +4773,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 9560c07105..16d760eae5 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -1671,7 +1671,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");
@@ -1701,3 +1701,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 13/24] vl: drop request_opengl variable, (continued)
- [Qemu-devel] [PATCH 13/24] vl: drop request_opengl variable, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 02/24] sdl: remove -alt-grab and -ctrl-grab support, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 03/24] sdl: use ctrl-alt-g as grab hotkey, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 09/24] curses: use DisplayOptions, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 21/24] sdl: build as module, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 19/24] console: add and use qemu_display_find_default, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 17/24] curses: hook up to display registry, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 18/24] egl-headless: hook up to display registry, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 01/24] sdl: remove -no-frame support, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 23/24] curses: build as module, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 16/24] cocoa: hook up to display registry,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 24/24] build: opengl should not need X11, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 14/24] console: add qemu display registry, add gtk, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 20/24] console: add ui module loading support, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 05/24] gtk: add and use DisplayOptions + DisplayGTK, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 22/24] gtk: build as module, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 15/24] sdl: hook up to display registry, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 06/24] sdl: use DisplayOptions, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 10/24] cocoa: use DisplayOptions, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 07/24] vl: drop no_quit variable, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 12/24] vl: drop display_type variable, Gerd Hoffmann, 2017/11/17