Re: [Qemu-devel] [FOR 0.12 PATCH v4 21/22] default devices: virtio consoles.

[Markus Armbruster]

Gerd Hoffmann <address@hidden> writes:

> This patch adds a variable default_virtcon which says whenever a default
> virtio console should be added.  It is disabled by default, followup
> patch will enable it for s390.  It is cleared when qemu finds
> '-virtiocon', '-device virtio-console-s390' or '-device
> virtio-console-pci' on the command line.
>
> Signed-off-by: Gerd Hoffmann <address@hidden>
> ---
>  vl.c |   65 +++++++++++++++++++++++++++++++++++------------------------------
>  1 files changed, 35 insertions(+), 30 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index ab77c35..b4138be 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -270,6 +270,7 @@ static void *boot_set_opaque;
>  
>  static int default_serial = 1;
>  static int default_parallel = 1;
> +static int default_virtcon = 0;
>  static int default_monitor = 1;
>  static int default_vga = 1;
>  static int default_drive = 1;
> @@ -280,6 +281,8 @@ static struct {
>  } default_list[] = {
>      { .driver = "isa-serial",           .flag = &default_serial    },
>      { .driver = "isa-parallel",         .flag = &default_parallel  },
> +    { .driver = "virtio-console-pci",   .flag = &default_virtcon   },
> +    { .driver = "virtio-console-s390",  .flag = &default_virtcon   },
>      { .driver = "VGA",                  .flag = &default_vga       },
>      { .driver = "Cirrus VGA",           .flag = &default_vga       },
>      { .driver = "QEMUware SVGA",        .flag = &default_vga       },
> @@ -4699,10 +4702,11 @@ static void monitor_parse(const char *optarg, const 
> char *mode)
>  
>  struct device_config {
>      enum {
> -        DEV_USB,       /* -usbdevice   */
> -        DEV_BT,        /* -bt          */
> -        DEV_SERIAL,    /* -serial      */
> -        DEV_PARALLEL,  /* -parallel    */
> +        DEV_USB,       /* -usbdevice     */
> +        DEV_BT,        /* -bt            */
> +        DEV_SERIAL,    /* -serial        */
> +        DEV_PARALLEL,  /* -parallel      */
> +        DEV_VIRTCON,   /* -virtioconsole */

Elaborate comment decorations mess up git-blame.  Just say no.

>      } type;
>      const char *cmdline;
>      QTAILQ_ENTRY(device_config) next;
[...]