Re: [Qemu-trivial] [Qemu-devel] [PATCH] qemu-doc: Clarify that -vga std is now the default

[Markus Armbruster]

Alberto Garcia <address@hidden> writes:

> The QEMU manual page states that Cirrus Logic is the default video
> card if the user doesn't specify any. However this is not true since
> QEMU 2.2.
>
> Signed-off-by: Alberto Garcia <address@hidden>
> ---
>  qemu-options.hx | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 80df52651a..66ee562821 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -1195,12 +1195,12 @@ Select type of VGA card to emulate. Valid values for 
> @var{type} are
>  Cirrus Logic GD5446 Video card. All Windows versions starting from
>  Windows 95 should recognize and use this graphic card. For optimal
>  performances, use 16 bit color depth in the guest and the host OS.
> -(This one is the default)
> +(This card was the default before QEMU 2.2)
>  @item std
>  Standard VGA card with Bochs VBE extensions.  If your guest OS
>  supports the VESA 2.0 VBE extensions (e.g. Windows XP) and if you want
>  to use high resolution modes (>= 1280x1024x16) then you should use
> -this option.
> +this option. (This card is the default since QEMU 2.2)
>  @item vmware
>  VMWare SVGA-II compatible adapter. Use it if you have sufficiently
>  recent XFree86/XOrg server or Windows guest with a driver for this

Do we want to cover history in the user manual?  Or should we simply
move the "(This one is the default)" phrase?

Hmm, the default seems to depend on the machine type:

    if (default_vga) {
        if (machine_class->default_display) {
            vga_model = machine_class->default_display;
        } else if (vga_interface_available(VGA_CIRRUS)) {
            vga_model = "cirrus";
        } else if (vga_interface_available(VGA_STD)) {
            vga_model = "std";
        }
    }

The pc-*-2.2 and newer set ->default_display = "std".

Everything else keeps it null, and therefore gets "cirrus" if compiled
in, else "std".

The easy way out is to simply delete "(This one is the default)".