qemu-trivial
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-trivial] [PATCH trivial] vl: always define no_frame


From: Michael Tokarev
Subject: [Qemu-trivial] [PATCH trivial] vl: always define no_frame
Date: Sat, 15 Jun 2013 14:42:03 +0400

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 <address@hidden>
Cc: address@hidden
Signed-off-by: Michael Tokarev <address@hidden>
---
 vl.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/vl.c b/vl.c
index 9f8fd6e..f94ec9c 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];
-- 
1.7.10.4




reply via email to

[Prev in Thread] Current Thread [Next in Thread]