aboutsummaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2016-04-19 16:55:17 -0300
committerEduardo Habkost <ehabkost@redhat.com>2016-05-20 14:28:52 -0300
commit7b7d2be50c9c0f125b0025024b7048df87ac36bb (patch)
tree1690da7ad6e0995a04513ad0a799e37c0d80abf1 /vl.c
parentc2c7b22db1dcb10b9ba9faa9cc82fb074a4db418 (diff)
downloadqemu-7b7d2be50c9c0f125b0025024b7048df87ac36bb.zip
qemu-7b7d2be50c9c0f125b0025024b7048df87ac36bb.tar.gz
qemu-7b7d2be50c9c0f125b0025024b7048df87ac36bb.tar.bz2
vl: Add DT_COCOA DisplayType value
Instead of reusing DT_SDL for Cocoa, use DT_COCOA to indicate that a Cocoa display was requested. configure already ensures CONFIG_COCOA and CONFIG_SDL are never set at the same time. The only case where DT_SDL is used outside a #ifdef CONFIG_SDL block is in the no_frame/alt_grab/ctrl_grab check. That means the only user-visible change is that we will start printing a warning if the SDL-specific options are used in Cocoa mode. This is a bugfix, because no_frame/alt_grab/ctrl_grab are not used by Cocoa code. Cc: Andreas Färber <andreas.faerber@web.de> Cc: Peter Maydell <peter.maydell@linaro.org> Acked-by: Andreas Färber <andreas.faerber@web.de> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/vl.c b/vl.c
index d309ff7..a064a46 100644
--- a/vl.c
+++ b/vl.c
@@ -4237,8 +4237,10 @@ int main(int argc, char **argv, char **envp)
if (display_type == DT_DEFAULT && !display_remote) {
#if defined(CONFIG_GTK)
display_type = DT_GTK;
-#elif defined(CONFIG_SDL) || defined(CONFIG_COCOA)
+#elif defined(CONFIG_SDL)
display_type = DT_SDL;
+#elif defined(CONFIG_COCOA)
+ display_type = DT_COCOA;
#elif defined(CONFIG_VNC)
vnc_parse("localhost:0,to=99,id=default", &error_abort);
show_vnc_port = 1;
@@ -4560,7 +4562,7 @@ int main(int argc, char **argv, char **envp)
sdl_display_init(ds, full_screen, no_frame);
break;
#elif defined(CONFIG_COCOA)
- case DT_SDL:
+ case DT_COCOA:
cocoa_display_init(ds, full_screen);
break;
#endif