Re: [Qemu-devel] [PATCH] console: nicer initial screen

[Anthony Liguori]

Gerd Hoffmann <address@hidden> writes:

> Now that we have a function to create a fancy DisplaySurface with a
> message for the user, to handle non-existing graphics hardware, we
> can make it more generic and use it for other things too.
>
> This patch adds a text line to the in initial DisplaySurface, notifying
> the user that the display isn't initialized yet by the guest.
>
> You can see this in action when starting qemu with '-S'.  Also when
> booting ovmf in qemu (which needs a few moments to initialize itself
> before it initializes the vga).
>
> Signed-off-by: Gerd Hoffmann <address@hidden>

Dunno if I said this in the previous posting, but what about just
blitting an image?   This text isn't internationalized.

Regards,

Anthony Liguori

> ---
>  ui/console.c |   19 +++++++++++--------
>  1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/ui/console.c b/ui/console.c
> index b30853f..05f0b4a 100644
> --- a/ui/console.c
> +++ b/ui/console.c
> @@ -1300,19 +1300,18 @@ DisplaySurface *qemu_create_displaysurface_from(int 
> width, int height, int bpp,
>      return surface;
>  }
>  
> -static DisplaySurface *qemu_create_dummy_surface(void)
> +static DisplaySurface *qemu_create_message_surface(int w, int h,
> +                                                   const char *msg)
>  {
> -    static const char msg[] =
> -        "This VM has no graphic display device.";
> -    DisplaySurface *surface = qemu_create_displaysurface(640, 480);
> +    DisplaySurface *surface = qemu_create_displaysurface(w, h);
>      pixman_color_t bg = color_table_rgb[0][COLOR_BLACK];
>      pixman_color_t fg = color_table_rgb[0][COLOR_WHITE];
>      pixman_image_t *glyph;
>      int len, x, y, i;
>  
>      len = strlen(msg);
> -    x = (640/FONT_WIDTH  - len) / 2;
> -    y = (480/FONT_HEIGHT - 1)   / 2;
> +    x = (w / FONT_WIDTH  - len) / 2;
> +    y = (h / FONT_HEIGHT - 1)   / 2;
>      for (i = 0; i < len; i++) {
>          glyph = qemu_pixman_glyph_from_vgafont(FONT_HEIGHT, vgafont16, 
> msg[i]);
>          qemu_pixman_glyph_render(glyph, surface->image, &fg, &bg,
> @@ -1334,6 +1333,8 @@ void qemu_free_displaysurface(DisplaySurface *surface)
>  
>  void register_displaychangelistener(DisplayChangeListener *dcl)
>  {
> +    static const char nodev[] =
> +        "This VM has no graphic display device.";
>      static DisplaySurface *dummy;
>      QemuConsole *con;
>  
> @@ -1352,7 +1353,7 @@ void 
> register_displaychangelistener(DisplayChangeListener *dcl)
>              dcl->ops->dpy_gfx_switch(dcl, con->surface);
>          } else {
>              if (!dummy) {
> -                dummy = qemu_create_dummy_surface();
> +                dummy = qemu_create_message_surface(640, 480, nodev);
>              }
>              dcl->ops->dpy_gfx_switch(dcl, dummy);
>          }
> @@ -1600,6 +1601,8 @@ QemuConsole *graphic_console_init(DeviceState *dev,
>                                    const GraphicHwOps *hw_ops,
>                                    void *opaque)
>  {
> +    static const char noinit[] =
> +        "Guest has not initialized the display (yet).";
>      Error *local_err = NULL;
>      int width = 640;
>      int height = 480;
> @@ -1616,7 +1619,7 @@ QemuConsole *graphic_console_init(DeviceState *dev,
>                                   "device", &local_err);
>      }
>  
> -    s->surface = qemu_create_displaysurface(width, height);
> +    s->surface = qemu_create_message_surface(width, height, noinit);
>      return s;
>  }
>  
> -- 
> 1.7.9.7