[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.7 v3 05/12] cocoa: cocoa_display_init() stub
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH for-2.7 v3 05/12] cocoa: cocoa_display_init() stub |
Date: |
Tue, 19 Apr 2016 16:55:21 -0300 |
One less #ifdef in vl.c.
Signed-off-by: Eduardo Habkost <address@hidden>
---
Changes v1 -> v2:
* Move stub file to stubs/ui/
Changes v2 -> v3:
* Fix typo (CONFIG_COCA) on comment
* Move stub to header file
---
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 51403c1..41cdb68 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.1.0
- [Qemu-devel] [PATCH for-2.7 v3 00/12] vl: graphics stubs + #ifdef cleanup + DT_NOGRAPHIC cleanup, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 03/12] curses: curses_display_init() stub, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 04/12] sdl: Initialization stubs, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 01/12] vl: Add DT_COCOA DisplayType value, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 05/12] cocoa: cocoa_display_init() stub,
Eduardo Habkost <=
- [Qemu-devel] [PATCH for-2.7 v3 02/12] vnc: Initialization stubs, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 07/12] spice: Initialization stubs on qemu-spice.h, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 08/12] milkymist: Move DT_NOGRAPHIC check outside milkymist_tmu2_create(), Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 10/12] vl: Make display_type a local variable, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 06/12] gtk: Initialization stubs, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 09/12] vl: Replace DT_NOGRAPHIC with machine option, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 12/12] vl: Make display_remote a local variable, Eduardo Habkost, 2016/04/19
- [Qemu-devel] [PATCH for-2.7 v3 11/12] vl: Move DisplayType typedef to vl.c, Eduardo Habkost, 2016/04/19