[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/21] cocoa: cocoa_display_init() stub
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 09/21] cocoa: cocoa_display_init() stub |
Date: |
Fri, 20 May 2016 17:28:29 -0300 |
One less #ifdef in vl.c.
Signed-off-by: Eduardo Habkost <address@hidden>
---
include/ui/console.h | 9 +++++++++
vl.c | 2 --
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index f3e749d..7ac997f 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -442,7 +442,16 @@ static inline void sdl_display_init(DisplayState *ds, int
full_screen,
#endif
/* cocoa.m */
+#ifdef CONFIG_COCOA
void cocoa_display_init(DisplayState *ds, int full_screen);
+#else
+static inline void cocoa_display_init(DisplayState *ds, int full_screen)
+{
+ /* 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);
diff --git a/vl.c b/vl.c
index d5df442..0648705 100644
--- a/vl.c
+++ b/vl.c
@@ -4545,11 +4545,9 @@ int main(int argc, char **argv, char **envp)
case DT_SDL:
sdl_display_init(ds, full_screen, no_frame);
break;
-#if defined(CONFIG_COCOA)
case DT_COCOA:
cocoa_display_init(ds, full_screen);
break;
-#endif
#if defined(CONFIG_GTK)
case DT_GTK:
gtk_display_init(ds, full_screen, grab_on_hover);
--
2.5.5
- [Qemu-devel] [PULL 00/21] Machine Core queue, 2016-05-20, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 19/21] vl: Use &error_fatal when parsing VNC options, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 07/21] curses: curses_display_init() stub, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 09/21] cocoa: cocoa_display_init() stub,
Eduardo Habkost <=
- [Qemu-devel] [PULL 08/21] sdl: Initialization stubs, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 18/21] machine: add properties to compat_props incrementaly, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 21/21] Use &error_fatal when initializing crypto on qemu-{img, io, nbd}, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 02/21] vl: Use exit(1) when requested VGA interface is unavailable, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 01/21] pc-dimm: correct comment of MemoryHotplugState, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 16/21] vl: Make display_remote a local variable, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 03/21] vl: Table-based select_vgahw(), Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 04/21] vl: Replace *_vga_available() functions with class_names field, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 12/21] milkymist: Move DT_NOGRAPHIC check outside milkymist_tmu2_create(), Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 13/21] vl: Replace DT_NOGRAPHIC with machine option, Eduardo Habkost, 2016/05/20