diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2016-04-19 16:55:22 -0300 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2016-05-20 14:28:53 -0300 |
| commit | 19a2c6269f2e81d3aecdddb4d77fb674f9ca8fa3 (patch) | |
| tree | 294e376f6e9ec610ea1fafbcb2b5c2b41df748f4 | |
| parent | e35ee7c1aa1f257d3e0e52422cf4bd79d3b68d58 (diff) | |
| download | qemu-19a2c6269f2e81d3aecdddb4d77fb674f9ca8fa3.zip qemu-19a2c6269f2e81d3aecdddb4d77fb674f9ca8fa3.tar.gz qemu-19a2c6269f2e81d3aecdddb4d77fb674f9ca8fa3.tar.bz2 | |
gtk: Initialization stubs
This reduces the number of CONFIG_GTK #ifdefs in vl.c.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | include/ui/console.h | 17 | ||||
| -rw-r--r-- | 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 @@ -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; } |