[Qemu-devel] [PATCH] fix no-sdl builds

[Qemu-devel] [PATCH] fix no-sdl builds

[Mike Frysinger]

The no_frame var is only defined when SDL support is enabled.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 vl.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/vl.c b/vl.c
index 9f8fd6e..aaa14bb 100644
--- a/vl.c
+++ b/vl.c
@@ -3524,9 +3524,6 @@ int main(int argc, char **argv, char **envp)
             case QEMU_OPTION_full_screen:
                 full_screen = 1;
                 break;
-            case QEMU_OPTION_no_frame:
-                no_frame = 1;
-                break;
             case QEMU_OPTION_alt_grab:
                 alt_grab = 1;
                 break;
@@ -3537,10 +3534,14 @@ int main(int argc, char **argv, char **envp)
                 no_quit = 1;
                 break;
 #ifdef CONFIG_SDL
+            case QEMU_OPTION_no_frame:
+                no_frame = 1;
+                break;
             case QEMU_OPTION_sdl:
                 display_type = DT_SDL;
                 break;
 #else
+            case QEMU_OPTION_no_frame:
             case QEMU_OPTION_sdl:
                 fprintf(stderr, "SDL support is disabled\n");
                 exit(1);
@@ -4081,10 +4082,12 @@ int main(int argc, char **argv, char **envp)
 #endif
     }
 
+#ifdef CONFIG_SDL
     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");
     }
+#endif
     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");
-- 
1.8.2.1

Re: [Qemu-devel] [PATCH] fix no-sdl builds

[Andreas Färber]

Hi,

Am 17.06.2013 00:48, schrieb Mike Frysinger:
> The no_frame var is only defined when SDL support is enabled.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>

There was already a different patch to the same effect on the list:
http://patchwork.ozlabs.org/patch/251621/

Any update on your Blackfin emulation? :)

Cheers,
Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH] fix no-sdl builds

[Mike Frysinger]

[-- Attachment #1: Type: Text/Plain, Size: 706 bytes --]

On Sunday 16 June 2013 20:52:18 Andreas Färber wrote:
> Am 17.06.2013 00:48, schrieb Mike Frysinger:
> > The no_frame var is only defined when SDL support is enabled.
> > 
> > Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> 
> There was already a different patch to the same effect on the list:
> http://patchwork.ozlabs.org/patch/251621/

np.  i wrote the patch on an airplane (hard to check the net there), and just 
checked the master branch when i got back.

> Any update on your Blackfin emulation? :)

i updated it to work on 1.5.0 & master this last week actually while flying.  i 
could probably post it again (sans the half baked hardware stuff for system 
emulation).
-mike

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]