[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] vga: disable default VGA if appropriate -device
From: |
Blue Swirl |
Subject: |
Re: [Qemu-devel] [PATCH] vga: disable default VGA if appropriate -device is used |
Date: |
Thu, 15 Mar 2012 20:01:02 +0000 |
On Thu, Mar 15, 2012 at 12:56, Paolo Bonzini <address@hidden> wrote:
> This is a partial revert of commits a369da5 (vga: improve VGA logic,
> committed 2012-01-22) and c5bd4f3 (vga: fix -nodefaults -device VGA,
> 2012-01-24) which broke command-line option parsing in different ways.
>
> Since commit a369da5 it has become impossible to specify a VGA device
> entirely with QemuOpts-enabled options, i.e. without needing an explicit
> "-vga none".
>
> In addition, until commit c5bd4f3 -nodefaults would not disable the device
> you specified with the legacy "-vga" option, independent of the order.
> Since commit c5bd4f3 QEMU -nodefaults will override a previous -vga
> option.
>
> I did not reintroduce machine->no_vga. Boards can simply ignore the
> vga_interface_type variable, and most will indeed do so.
>
> Cc: Blue Swirl <address@hidden>
I have a RedHat address! How on earth did this happen? What was in my
last drink yesterday, I swear there was a funny taste? Wait a minute,
were you this "Paul Bonson" guy? What else did I sign? Is this new
tattoo permanent?
Otherwise patch looks OK.
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
> vl.c | 25 ++++++++++++++++---------
> 1 files changed, 16 insertions(+), 9 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index 65f11f2..fd394c8 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -272,6 +272,7 @@ static int default_monitor = 1;
> static int default_floppy = 1;
> static int default_cdrom = 1;
> static int default_sdcard = 1;
> +static int default_vga = 1;
>
> static struct {
> const char *driver;
> @@ -287,6 +288,12 @@ static struct {
> { .driver = "virtio-serial-pci", .flag = &default_virtcon },
> { .driver = "virtio-serial-s390", .flag = &default_virtcon },
> { .driver = "virtio-serial", .flag = &default_virtcon },
> + { .driver = "VGA", .flag = &default_vga },
> + { .driver = "isa-vga", .flag = &default_vga },
> + { .driver = "cirrus-vga", .flag = &default_vga },
> + { .driver = "isa-cirrus-vga", .flag = &default_vga },
> + { .driver = "vmware-svga", .flag = &default_vga },
> + { .driver = "qxl-vga", .flag = &default_vga },
> };
>
> static void res_free(void)
> @@ -2269,7 +2276,7 @@ int main(int argc, char **argv, char **envp)
> const char *loadvm = NULL;
> QEMUMachine *machine;
> const char *cpu_model;
> - const char *vga_model = NULL;
> + const char *vga_model = "none";
> const char *pid_file = NULL;
> const char *incoming = NULL;
> #ifdef CONFIG_VNC
> @@ -2699,6 +2706,7 @@ int main(int argc, char **argv, char **envp)
> break;
> case QEMU_OPTION_vga:
> vga_model = optarg;
> + default_vga = 0;
> break;
> case QEMU_OPTION_g:
> {
> @@ -3107,7 +3115,7 @@ int main(int argc, char **argv, char **envp)
> default_floppy = 0;
> default_cdrom = 0;
> default_sdcard = 0;
> - vga_model = "none";
> + default_vga = 0;
> break;
> case QEMU_OPTION_xen_domid:
> if (!(xen_available())) {
> @@ -3468,14 +3476,13 @@ int main(int argc, char **argv, char **envp)
>
> module_call_init(MODULE_INIT_QOM);
>
> - /* must be after qdev registration but before machine init */
> - if (vga_model) {
> - select_vgahw(vga_model);
> - } else if (cirrus_vga_available()) {
> - select_vgahw("cirrus");
> - } else {
> - select_vgahw("none");
> + /* This must be after qdev registration but before machine init.
> + * If no default VGA is requested, the default is "none".
> + */
> + if (default_vga && cirrus_vga_available()) {
> + vga_model = "cirrus";
> }
> + select_vgahw(vga_model);
>
> if (qemu_opts_foreach(qemu_find_opts("device"), device_help_func, NULL,
> 0) != 0)
> exit(0);
> --
> 1.7.7.6
>
>