falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix vga_interface_type for command line argument '-device VGA' 

Some machine (like pseries) initialization code determines if it has
graphics according to vga_interface_type. In the original code,
vga_interface_type is evaluated to VGA_NONE even if a VGA is added
via '-device VGA'. It causes the machine not aware of the graphics
device configured. Add a new VGA device type to indicate that it has a
VGA device, which will be initialized in QOM device initialization.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Mark Wu <wudxw@linux.vnet.ibm.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Mark Wu 2014-03-10 22:37:40 +08:00 committed by Andreas Färber
parent d7f0a59ff0
commit d44229c54f
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sysemu/sysemu.h
View File

@ -104,7 +104,7 @@ extern int autostart;
typedef enum {
VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB, VGA_QXL,
VGA_TCX, VGA_CG3,
VGA_TCX, VGA_CG3, VGA_DEVICE
} VGAInterfaceType;
extern int vga_interface_type;

42
vl.c
View File

@ -213,6 +213,7 @@ uint32_t xen_domid;
enum xen_mode xen_mode = XEN_EMULATE;
static int tcg_tb_size;
static int has_defaults = 1;
static int default_serial = 1;
static int default_parallel = 1;
static int default_virtcon = 1;
@ -2122,7 +2123,7 @@ static void select_vgahw (const char *p)
{
const char *opts;
vga_interface_type = VGA_NONE;
assert(vga_interface_type == VGA_NONE);
if (strstart(p, "std", &opts)) {
if (vga_available()) {
vga_interface_type = VGA_STD;
@ -2912,7 +2913,7 @@ int main(int argc, char **argv, char **envp)
MachineClass *machine_class;
QEMUMachine *machine;
const char *cpu_model;
const char *vga_model = "none";
const char *vga_model = NULL;
const char *qtest_chrdev = NULL;
const char *qtest_log = NULL;
const char *pid_file = NULL;
@ -3762,16 +3763,7 @@ int main(int argc, char **argv, char **envp)
runstate_set(RUN_STATE_INMIGRATE);
break;
case QEMU_OPTION_nodefaults:
default_serial = 0;
default_parallel = 0;
default_virtcon = 0;
default_sclp = 0;
default_monitor = 0;
default_net = 0;
default_floppy = 0;
default_cdrom = 0;
default_sdcard = 0;
default_vga = 0;
has_defaults = 0;
break;
case QEMU_OPTION_xen_domid:
if (!(xen_available())) {
@ -4004,27 +3996,35 @@ int main(int argc, char **argv, char **envp)
qemu_opts_foreach(qemu_find_opts("device"), default_driver_check, NULL, 0);
qemu_opts_foreach(qemu_find_opts("global"), default_driver_check, NULL, 0);
if (machine->no_serial) {
if (!vga_model && !default_vga) {
vga_interface_type = VGA_DEVICE;
}
if (!has_defaults || machine->no_serial) {
default_serial = 0;
}
if (machine->no_parallel) {
if (!has_defaults || machine->no_parallel) {
default_parallel = 0;
}
if (!machine->use_virtcon) {
if (!has_defaults || !machine->use_virtcon) {
default_virtcon = 0;
}
if (!machine->use_sclp) {
if (!has_defaults || !machine->use_sclp) {
default_sclp = 0;
}
if (machine->no_floppy) {
if (!has_defaults || machine->no_floppy) {
default_floppy = 0;
}
if (machine->no_cdrom) {
if (!has_defaults || machine->no_cdrom) {
default_cdrom = 0;
}
if (machine->no_sdcard) {
if (!has_defaults || machine->no_sdcard) {
default_sdcard = 0;
}
if (!has_defaults) {
default_monitor = 0;
default_net = 0;
default_vga = 0;
}
if (is_daemonized()) {
/* According to documentation and historically, -nographic redirects
@ -4329,7 +4329,9 @@ int main(int argc, char **argv, char **envp)
vga_model = "std";
}
}
select_vgahw(vga_model);
if (vga_model) {
select_vgahw(vga_model);
}
if (watchdog) {
i = select_watchdog(watchdog);