[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/21] gtk: Initialization stubs
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 10/21] gtk: Initialization stubs |
Date: |
Fri, 20 May 2016 17:28:30 -0300 |
This reduces the number of CONFIG_GTK #ifdefs in vl.c.
Signed-off-by: Eduardo Habkost <address@hidden>
---
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 0648705..6e8d25e 100644
--- a/vl.c
+++ b/vl.c
@@ -148,9 +148,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];
@@ -4246,11 +4244,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.5.5
- [Qemu-devel] [PULL 04/21] vl: Replace *_vga_available() functions with class_names field, (continued)
- [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
- [Qemu-devel] [PULL 14/21] vl: Make display_type a local variable, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 11/21] spice: Initialization stubs on qemu-spice.h, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 05/21] vl: Add DT_COCOA DisplayType value, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 20/21] vl: Use &error_fatal when parsing monitor options, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 06/21] vnc: Initialization stubs, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 17/21] vl: Simplify global property registration, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 15/21] vl: Move DisplayType typedef to vl.c, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 10/21] gtk: Initialization stubs,
Eduardo Habkost <=
- Re: [Qemu-devel] [PULL 00/21] Machine Core queue, 2016-05-20, Peter Maydell, 2016/05/23