From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=48649 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pz6ti-0007LS-NS for qemu-devel@nongnu.org; Mon, 14 Mar 2011 08:29:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pz6td-0004J9-RF for qemu-devel@nongnu.org; Mon, 14 Mar 2011 08:29:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60193) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pz6td-0004Ir-Fz for qemu-devel@nongnu.org; Mon, 14 Mar 2011 08:29:13 -0400 From: Jes.Sorensen@redhat.com Date: Mon, 14 Mar 2011 13:28:42 +0100 Message-Id: <1300105726-25937-2-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1300105726-25937-1-git-send-email-Jes.Sorensen@redhat.com> References: <1300105726-25937-1-git-send-email-Jes.Sorensen@redhat.com> Subject: [Qemu-devel] [PATCH 1/5] Introduce -display argument List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com, peter.maydell@linaro.org From: Jes Sorensen This patch introduces a -display argument which consolidates the setting of the display mode. Valid options are: sdl/curses/default/nographic Signed-off-by: Jes Sorensen --- qemu-options.hx | 28 ++++++++++++++++++++++++++++ vl.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index badb730..f14ff02 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -590,6 +590,34 @@ STEXI @table @option ETEXI +DEF("display", HAS_ARG, QEMU_OPTION_display, + "-display [default|sdl|curses|nographic|none]\n" + " select display type\n", QEMU_ARCH_ALL) +STEXI +@item -display @var{type} +@findex -display +Select type of display to use. This option is a replacement for the +old style -sdl/-curses/... options. Valid values for @var{type} are +@table @option +@item default +Pick the default display option. This will depend on how QEMU was +configured. (This one is the default) +@item sdl +Pick the SDL display option. +@item curses +Pick the curses display option. Normally, QEMU uses SDL to display the +VGA output. With this option, QEMU can display the VGA output when in +text mode using a curses/ncurses interface. Nothing is displayed in +graphical mode. +@item nographic +Normally, QEMU uses SDL to display the VGA output. With this option, +you can totally disable graphical output so that QEMU is a simple +command line application. The emulated serial port is redirected on +the console. Therefore, you can still use QEMU to debug a Linux kernel +with a serial console. +@end table +ETEXI + DEF("nographic", 0, QEMU_OPTION_nographic, "-nographic disable graphical output and redirect serial I/Os to console\n", QEMU_ARCH_ALL) diff --git a/vl.c b/vl.c index 5e007a7..e797e61 100644 --- a/vl.c +++ b/vl.c @@ -1554,6 +1554,37 @@ static void select_vgahw (const char *p) } } +static DisplayType select_display(const char *p) +{ + const char *opts; + DisplayType display = DT_DEFAULT; + + if (strstart(p, "default", &opts)) { + display = DT_DEFAULT; + } else if (strstart(p, "sdl", &opts)) { +#ifdef CONFIG_SDL + display = DT_SDL; +#else + fprintf(stderr, "SDL support is disabled\n"); + exit(1); +#endif + } else if (strstart(p, "curses", &opts)) { +#ifdef CONFIG_CURSES + display = DT_CURSES; +#else + fprintf(stderr, "Curses support is disabled\n"); + exit(1); +#endif + } else if (strstart(p, "nographic", &opts)) { + display = DT_NOGRAPHIC; + } else { + fprintf(stderr, "Unknown display type: %s\n", p); + exit(1); + } + + return display; +} + static int balloon_parse(const char *arg) { QemuOpts *opts; @@ -2152,6 +2183,9 @@ int main(int argc, char **argv, char **envp) } numa_add(optarg); break; + case QEMU_OPTION_display: + display_type = select_display(optarg); + break; case QEMU_OPTION_nographic: display_type = DT_NOGRAPHIC; break; -- 1.7.4