From: Blue Swirl <blauwirbel@gmail.com>
Date: Tue, 24 Jan 2012 17:27:35 +0000 (+0000)
Subject: vga: fix -nodefaults -device VGA
X-Git-Tag: v1.1-rc0~532
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5bd4f3;p=thirdparty%2Fqemu.git

vga: fix -nodefaults -device VGA

Flag -nodefaults should also imply no VGA. This was broken in
a369da5f31ddbdeb32a7f76622e480d3995fbb00.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/vl.c b/vl.c
index 57378b65278..d88a18c0474 100644
--- a/vl.c
+++ b/vl.c
@@ -3006,6 +3006,7 @@ int main(int argc, char **argv, char **envp)
                 default_floppy = 0;
                 default_cdrom = 0;
                 default_sdcard = 0;
+                vga_model = "none";
                 break;
             case QEMU_OPTION_xen_domid:
                 if (!(xen_available())) {