diff --git a/hw/pc.c b/hw/pc.c index efd291dfedc18d70e31b8fd4797314097aa8405e..d64e442601da8cac3016c0dd2d9009a12c6a890b 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -852,22 +852,24 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size, exit(1); } - /* VGA BIOS load */ - if (cirrus_vga_enabled) { - snprintf(buf, sizeof(buf), "%s/%s", bios_dir, VGABIOS_CIRRUS_FILENAME); - } else { - snprintf(buf, sizeof(buf), "%s/%s", bios_dir, VGABIOS_FILENAME); - } - vga_bios_size = get_image_size(buf); - if (vga_bios_size <= 0 || vga_bios_size > 65536) - goto vga_bios_error; - vga_bios_offset = qemu_ram_alloc(65536); - - ret = load_image(buf, phys_ram_base + vga_bios_offset); - if (ret != vga_bios_size) { - vga_bios_error: - fprintf(stderr, "qemu: could not load VGA BIOS '%s'\n", buf); - exit(1); + if (cirrus_vga_enabled || std_vga_enabled || vmsvga_enabled) { + /* VGA BIOS load */ + if (cirrus_vga_enabled) { + snprintf(buf, sizeof(buf), "%s/%s", bios_dir, VGABIOS_CIRRUS_FILENAME); + } else { + snprintf(buf, sizeof(buf), "%s/%s", bios_dir, VGABIOS_FILENAME); + } + vga_bios_size = get_image_size(buf); + if (vga_bios_size <= 0 || vga_bios_size > 65536) + goto vga_bios_error; + vga_bios_offset = qemu_ram_alloc(65536); + + ret = load_image(buf, phys_ram_base + vga_bios_offset); + if (ret != vga_bios_size) { +vga_bios_error: + fprintf(stderr, "qemu: could not load VGA BIOS '%s'\n", buf); + exit(1); + } } /* setup basic memory access */ @@ -956,7 +958,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size, vga_ram_addr, vga_ram_size); else fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __FUNCTION__); - } else { + } else if (std_vga_enabled) { if (pci_enabled) { pci_vga_init(pci_bus, ds, phys_ram_base + vga_ram_addr, vga_ram_addr, vga_ram_size, 0, 0); diff --git a/sysemu.h b/sysemu.h index 5cb70fd8ee908488a8130dc608fb36a4c8bf2f8b..55f8d79da8e3c612faaa48c6a308c54bfd9f8ff4 100644 --- a/sysemu.h +++ b/sysemu.h @@ -83,6 +83,7 @@ void do_info_slirp(void); extern int bios_size; extern int cirrus_vga_enabled; +extern int std_vga_enabled; extern int vmsvga_enabled; extern int graphic_width; extern int graphic_height; diff --git a/vl.c b/vl.c index f0701da6e47ab40640dfe76bb1ae6218b8f17698..b35d740a5d784a2856840fe665652083218762e9 100644 --- a/vl.c +++ b/vl.c @@ -192,6 +192,7 @@ int vm_running; static int rtc_utc = 1; static int rtc_date_offset = -1; /* -1 means no change */ int cirrus_vga_enabled = 1; +int std_vga_enabled = 0; int vmsvga_enabled = 0; #ifdef TARGET_SPARC int graphic_width = 1024; @@ -3873,7 +3874,7 @@ static void help(int exitcode) " use -soundhw ? to get the list of supported cards\n" " use -soundhw all to enable all of them\n" #endif - "-vga [std|cirrus|vmware]\n" + "-vga [std|cirrus|vmware|none]\n" " select video card type\n" "-localtime set the real time clock to local time [default=utc]\n" "-full-screen start in full screen\n" @@ -4407,14 +4408,21 @@ static void select_vgahw (const char *p) const char *opts; if (strstart(p, "std", &opts)) { + std_vga_enabled = 1; cirrus_vga_enabled = 0; vmsvga_enabled = 0; } else if (strstart(p, "cirrus", &opts)) { cirrus_vga_enabled = 1; + std_vga_enabled = 0; vmsvga_enabled = 0; } else if (strstart(p, "vmware", &opts)) { cirrus_vga_enabled = 0; + std_vga_enabled = 0; vmsvga_enabled = 1; + } else if (strstart(p, "none", &opts)) { + cirrus_vga_enabled = 0; + std_vga_enabled = 0; + vmsvga_enabled = 0; } else { invalid_vga: fprintf(stderr, "Unknown vga type: %s\n", p);