From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Cc: Jes Sorensen <Jes.Sorensen@redhat.com>, patches@linaro.org
Subject: [Qemu-devel] [PATCH] vl.c: Fix compilation failure if CONFIG_SDL isn't defined
Date: Wed, 23 Mar 2011 13:40:57 +0000 [thread overview]
Message-ID: <1300887657-9634-1-git-send-email-peter.maydell@linaro.org> (raw)
Fix a compilation failure if CONFIG_SDL isn't defined (gcc complained
that the label 'invalid_display' wasn't used).
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
vl.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/vl.c b/vl.c
index dbb927d..c387f2b 100644
--- a/vl.c
+++ b/vl.c
@@ -1575,7 +1575,7 @@ static DisplayType select_display(const char *p)
} else if (strstart(opts, "off", &nextopt)) {
no_frame = 1;
} else {
- goto invalid_display;
+ goto invalid_sdl_args;
}
} else if (strstart(opts, ",alt_grab=", &nextopt)) {
opts = nextopt;
@@ -1584,7 +1584,7 @@ static DisplayType select_display(const char *p)
} else if (strstart(opts, "off", &nextopt)) {
alt_grab = 0;
} else {
- goto invalid_display;
+ goto invalid_sdl_args;
}
} else if (strstart(opts, ",ctrl_grab=", &nextopt)) {
opts = nextopt;
@@ -1593,7 +1593,7 @@ static DisplayType select_display(const char *p)
} else if (strstart(opts, "off", &nextopt)) {
ctrl_grab = 0;
} else {
- goto invalid_display;
+ goto invalid_sdl_args;
}
} else if (strstart(opts, ",window_close=", &nextopt)) {
opts = nextopt;
@@ -1602,10 +1602,12 @@ static DisplayType select_display(const char *p)
} else if (strstart(opts, "off", &nextopt)) {
no_quit = 1;
} else {
- goto invalid_display;
+ goto invalid_sdl_args;
}
} else {
- goto invalid_display;
+ invalid_sdl_args:
+ fprintf(stderr, "Invalid SDL option string: %s\n", p);
+ exit(1);
}
opts = nextopt;
}
@@ -1642,7 +1644,6 @@ static DisplayType select_display(const char *p)
} else if (strstart(p, "none", &opts)) {
display = DT_NONE;
} else {
- invalid_display:
fprintf(stderr, "Unknown display type: %s\n", p);
exit(1);
}
--
1.7.1
next reply other threads:[~2011-03-23 13:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-23 13:40 Peter Maydell [this message]
2011-03-23 13:47 ` [Qemu-devel] Re: [PATCH] vl.c: Fix compilation failure if CONFIG_SDL isn't defined Jes Sorensen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1300887657-9634-1-git-send-email-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=Jes.Sorensen@redhat.com \
--cc=patches@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).