From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=39115 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzVbA-0007sa-IN for qemu-devel@nongnu.org; Tue, 15 Mar 2011 10:51:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PzVb9-0002kx-2Q for qemu-devel@nongnu.org; Tue, 15 Mar 2011 10:51:48 -0400 Received: from mail-iw0-f173.google.com ([209.85.214.173]:48072) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PzVb8-0002kn-UI for qemu-devel@nongnu.org; Tue, 15 Mar 2011 10:51:47 -0400 Received: by iwl42 with SMTP id 42so730360iwl.4 for ; Tue, 15 Mar 2011 07:51:46 -0700 (PDT) Message-ID: <4D7F7CFF.2010309@codemonkey.ws> Date: Tue, 15 Mar 2011 09:51:43 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1300192574-32644-1-git-send-email-Jes.Sorensen@redhat.com> <1300192574-32644-3-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1300192574-32644-3-git-send-email-Jes.Sorensen@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH 2/7] Introduce -display argument List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jes.Sorensen@redhat.com Cc: jan.kiszka@siemens.com, qemu-devel@nongnu.org, peter.maydell@linaro.org On 03/15/2011 07:36 AM, Jes.Sorensen@redhat.com wrote: > From: Jes Sorensen > > This patch introduces a -display argument which consolidates the > setting of the display mode. Valid options are: > sdl/curses/default/serial (serial is equivalent to -nographic) > > Signed-off-by: Jes Sorensen > --- > qemu-options.hx | 27 +++++++++++++++++++ > vl.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 104 insertions(+), 0 deletions(-) > > diff --git a/qemu-options.hx b/qemu-options.hx > index badb730..f08ffb1 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -590,6 +590,33 @@ STEXI > @table @option > ETEXI > > +DEF("display", HAS_ARG, QEMU_OPTION_display, > + "-display sdl[,frame=on|off][,alt_grab=on|off][,ctrl_grab=on|off]\n" > + " [,window_close=on|off]|curses|serial\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 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 serial > +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. This option is equivalent to the old -nographic > +argument. > +@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..c88ee58 100644 > --- a/vl.c > +++ b/vl.c > @@ -1554,6 +1554,80 @@ static void select_vgahw (const char *p) > } > } > > +static DisplayType select_display(const char *p) > +{ > + const char *opts; > + DisplayType display = DT_DEFAULT; > + > + if (strstart(p, "sdl",&opts)) { > +#ifdef CONFIG_SDL > + display = DT_SDL; > + while (*opts) { > + const char *nextopt; > + > + if (strstart(opts, ",frame=",&nextopt)) { > + opts = nextopt; > + if (strstart(opts, "on",&nextopt)) { > + no_frame = 0; > + } else if (strstart(opts, "off",&nextopt)) { > + no_frame = 1; > + } else { > + goto invalid_display; > + } > + } else if (strstart(opts, ",alt_grab=",&nextopt)) { > + opts = nextopt; > + if (strstart(opts, "on",&nextopt)) { > + alt_grab = 1; > + } else if (strstart(opts, "off",&nextopt)) { > + alt_grab = 0; > + } else { > + goto invalid_display; > + } > + } else if (strstart(opts, ",ctrl_grab=",&nextopt)) { > + opts = nextopt; > + if (strstart(opts, "on",&nextopt)) { > + ctrl_grab = 1; > + } else if (strstart(opts, "off",&nextopt)) { > + ctrl_grab = 0; > + } else { > + goto invalid_display; > + } > + } else if (strstart(opts, ",window_close=",&nextopt)) { > + opts = nextopt; > + if (strstart(opts, "on",&nextopt)) { > + no_quit = 0; > + } else if (strstart(opts, "off",&nextopt)) { > + no_quit = 1; > + } else { > + goto invalid_display; > + } > + } else { > + goto invalid_display; > + } > + opts = nextopt; > + } So the natural reaction here is going to be, "just use QemuOpts". But this is harder than it seems. The problem is that the VNC options inverse the meaning of booleans making conversion of VNC to use QemuOpts much harder than it would appear. Doing it this way lets us pass the vnc option string directly to vnc_display_open(). I don't like it much, but I don't mind it as an interim step. Regards, Anthony Liguori > +#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, "serial",&opts)) { > + display = DT_NOGRAPHIC; > + } else { > + invalid_display: > + fprintf(stderr, "Unknown display type: %s\n", p); > + exit(1); > + } > + > + return display; > +} > + > static int balloon_parse(const char *arg) > { > QemuOpts *opts; > @@ -2152,6 +2226,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;