[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.7 v3 06/12] gtk: Initialization stubs
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH for-2.7 v3 06/12] gtk: Initialization stubs |
Date: |
Tue, 19 Apr 2016 16:55:22 -0300 |
This reduces the number of CONFIG_GTK #ifdefs in vl.c.
Signed-off-by: Eduardo Habkost <address@hidden>
---
Changes v1 -> v2:
* Move stub file to stubs/ui/
Changes v2 -> v3:
* Add early_gtk_display_init() stub
* Move stubs to header file
---
include/ui/console.h | 17 +++++++++++++++++
vl.c | 7 +------
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index 7ac997f..52a5f65 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -506,7 +506,24 @@ static inline void curses_display_init(DisplayState *ds,
int full_screen)
int index_from_key(const char *key, size_t key_length);
/* gtk.c */
+#ifdef CONFIG_GTK
void early_gtk_display_init(int opengl);
void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover);
+#else
+static inline void gtk_display_init(DisplayState *ds, bool full_screen,
+ bool grab_on_hover)
+{
+ /* This must never be called if CONFIG_GTK is disabled */
+ error_report("GTK support is disabled");
+ abort();
+}
+
+static inline void early_gtk_display_init(int opengl)
+{
+ /* This must never be called if CONFIG_GTK is disabled */
+ error_report("GTK support is disabled");
+ abort();
+}
+#endif
#endif
diff --git a/vl.c b/vl.c
index 41cdb68..067d37e 100644
--- a/vl.c
+++ b/vl.c
@@ -146,9 +146,7 @@ int vga_interface_type = VGA_NONE;
static int full_screen = 0;
static int no_frame = 0;
int no_quit = 0;
-#ifdef CONFIG_GTK
static bool grab_on_hover;
-#endif
CharDriverState *serial_hds[MAX_SERIAL_PORTS];
CharDriverState *parallel_hds[MAX_PARALLEL_PORTS];
CharDriverState *virtcon_hds[MAX_VIRTIO_CONSOLES];
@@ -4244,11 +4242,10 @@ int main(int argc, char **argv, char **envp)
"ignoring option");
}
-#if defined(CONFIG_GTK)
if (display_type == DT_GTK) {
early_gtk_display_init(request_opengl);
}
-#endif
+
if (display_type == DT_SDL) {
sdl_display_early_init(request_opengl);
}
@@ -4548,11 +4545,9 @@ int main(int argc, char **argv, char **envp)
case DT_COCOA:
cocoa_display_init(ds, full_screen);
break;
-#if defined(CONFIG_GTK)
case DT_GTK:
gtk_display_init(ds, full_screen, grab_on_hover);
break;
-#endif
default:
break;
}
--
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, 2016/04/19
- [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 <=
- [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