[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH] Revert "Unbreak -no-quit for GTK, validate SDL op
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PATCH] Revert "Unbreak -no-quit for GTK, validate SDL options" |
Date: |
Fri, 14 Jun 2013 23:09:35 +0400 |
This reverts commit 047d4e151dd462915786a4fddc12f774d0028af5.
The commit in question introduced old/legacy options (-no-quit
and some more) for the new interface type (gtk), -- on the
second thought I think we shouldn't do that, instead, we should
use the display-specific options (like -display sdl,frame=no),
and should not extend the legacy interface further which makes
messy quite fast.
And more, that change broke build without sdl, by referring to
`no_frame' variable which were guarded by #if SDL.
So reverting it for now I thinks is the best option. Further
plan, I think, is to make the documentation more clear that
these options are legacy.
Cc: Peter Wu <address@hidden>
Cc: address@hidden
Signed-off-By: Michael Tokarev <address@hidden>
---
vl.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/vl.c b/vl.c
index 9f8fd6e..169c807 100644
--- a/vl.c
+++ b/vl.c
@@ -3524,6 +3524,7 @@ int main(int argc, char **argv, char **envp)
case QEMU_OPTION_full_screen:
full_screen = 1;
break;
+#ifdef CONFIG_SDL
case QEMU_OPTION_no_frame:
no_frame = 1;
break;
@@ -3536,11 +3537,14 @@ int main(int argc, char **argv, char **envp)
case QEMU_OPTION_no_quit:
no_quit = 1;
break;
-#ifdef CONFIG_SDL
case QEMU_OPTION_sdl:
display_type = DT_SDL;
break;
#else
+ case QEMU_OPTION_no_frame:
+ case QEMU_OPTION_alt_grab:
+ case QEMU_OPTION_ctrl_grab:
+ case QEMU_OPTION_no_quit:
case QEMU_OPTION_sdl:
fprintf(stderr, "SDL support is disabled\n");
exit(1);
@@ -4081,15 +4085,6 @@ int main(int argc, char **argv, char **envp)
#endif
}
- if ((no_frame || alt_grab || ctrl_grab) && display_type != DT_SDL) {
- fprintf(stderr, "-no-frame, -alt-grab and -ctrl-grab are only valid "
- "for SDL, ignoring option\n");
- }
- if (no_quit && (display_type != DT_GTK && display_type != DT_SDL)) {
- fprintf(stderr, "-no-quit is only valid for GTK and SDL, "
- "ignoring option\n");
- }
-
#if defined(CONFIG_GTK)
if (display_type == DT_GTK) {
early_gtk_display_init();
--
1.7.10.4
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-trivial] [PATCH] Revert "Unbreak -no-quit for GTK, validate SDL options",
Michael Tokarev <=