aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Tokarev <mjt@tls.msk.ru>2013-06-15 14:42:03 +0400
committerAnthony Liguori <aliguori@us.ibm.com>2013-06-16 20:00:27 -0500
commita1077090cea97df26a754d16d7c9e1d410d81eaa (patch)
treebbba898544c79215d3969e6c74476fed05063968
parent90a2541b763b31d2b551b07e24aae3de5266d31b (diff)
vl: always define no_frame
Commit 047d4e151dd46 "Unbreak -no-quit for GTK, validate SDL options" broke build of qemu without sdl, by referencing `no_frame' variable which is defined inside #if SDL block. Fix that by defining that variable unconditionally. This is a better fix for the build issue introduced by that patch than a revert. This change keeps the new functinality introduced by that patch and just fixes the compilation. It still is not a complete fix around the original issue (not working -no-frame et al with -display gtk), because it makes only the legacy interface working, not the new suboption interface, so a few more changes are needed. Cc: Peter Wu <lekensteyn@gmail.com> Cc: qemu-trivial@nongnu.org Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> Reviewed-by: Peter Wu <lekensteyn@gmail.com> Tested-by: Andreas Färber <afaerber@suse.de> Message-id: 1371292923-28105-1-git-send-email-mjt@msgid.tls.msk.ru Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--vl.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/vl.c b/vl.c
index 9f8fd6e377..f94ec9ca17 100644
--- a/vl.c
+++ b/vl.c
@@ -199,9 +199,7 @@ static int rtc_date_offset = -1; /* -1 means no change */
QEMUClock *rtc_clock;
int vga_interface_type = VGA_NONE;
static int full_screen = 0;
-#ifdef CONFIG_SDL
static int no_frame = 0;
-#endif
int no_quit = 0;
CharDriverState *serial_hds[MAX_SERIAL_PORTS];
CharDriverState *parallel_hds[MAX_PARALLEL_PORTS];