[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/10] default devices: vga adapter.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 07/10] default devices: vga adapter. |
Date: |
Tue, 24 Nov 2009 09:58:41 +0100 |
Qemu creates a vga display for you in case you didn't specify one on the
command line. Right now this is tied to the '-vga <type>' command line
switch, which in turn causes trouble if you are creating your gfx card
using '-device VGA,<props>'.
This patch adds a variable default_vga which says whenever a default
serial line should be added. It is enabled by default. It is cleared
when qemu finds '-vga' or '-device {VGA,Cirrus VGA,QEMUware SVGA}' on
the command line.
'-device VGA' still doesn't work though due to a initialization order
issue (vga must init before calling i440fx_init_memory_mappings).
Signed-off-by: Gerd Hoffmann <address@hidden>
---
vl.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/vl.c b/vl.c
index e3d2ea3..eb1d23e 100644
--- a/vl.c
+++ b/vl.c
@@ -194,7 +194,7 @@ int autostart;
static int rtc_utc = 1;
static int rtc_date_offset = -1; /* -1 means no change */
QEMUClock *rtc_clock;
-int vga_interface_type = VGA_CIRRUS;
+int vga_interface_type = VGA_NONE;
#ifdef TARGET_SPARC
int graphic_width = 1024;
int graphic_height = 768;
@@ -276,6 +276,7 @@ static void *boot_set_opaque;
static int default_serial = 1;
static int default_parallel = 1;
static int default_monitor = 1;
+static int default_vga = 1;
static struct {
const char *driver;
@@ -283,6 +284,9 @@ static struct {
} default_list[] = {
{ .driver = "isa-serial", .flag = &default_serial },
{ .driver = "isa-parallel", .flag = &default_parallel },
+ { .driver = "VGA", .flag = &default_vga },
+ { .driver = "Cirrus VGA", .flag = &default_vga },
+ { .driver = "QEMUware SVGA", .flag = &default_vga },
};
static int default_driver_check(QemuOpts *opts, void *opaque)
@@ -4326,6 +4330,7 @@ static void select_vgahw (const char *p)
{
const char *opts;
+ default_vga = 0;
vga_interface_type = VGA_NONE;
if (strstart(p, "std", &opts)) {
vga_interface_type = VGA_STD;
@@ -5507,6 +5512,8 @@ int main(int argc, char **argv, char **envp)
if (default_monitor)
add_device_config(DEV_MONITOR, "vc:80Cx24C");
}
+ if (default_vga)
+ vga_interface_type = VGA_CIRRUS;
#ifndef _WIN32
if (daemonize) {
--
1.6.2.5
- [Qemu-devel] [PATCH 00/10] default devices: qdev integration., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 01/10] chardev: move greeting into vc backend., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 02/10] vc: colorize chardev title line with blue background., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 03/10] default devices: core code & serial lines., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 06/10] zap serial_monitor_mux, Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 08/10] default devices: add global cmd line option., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 07/10] default devices: vga adapter.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 04/10] default devices: parallel port., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 05/10] default devices: qemu monitor., Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 10/10] default devices: drives, Gerd Hoffmann, 2009/11/24
- [Qemu-devel] [PATCH 09/10] default devices: network, Gerd Hoffmann, 2009/11/24
- Re: [Qemu-devel] [PATCH 00/10] default devices: qdev integration., Markus Armbruster, 2009/11/24