diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2010-12-27 22:59:48 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-12-27 22:59:48 +0100 |
| commit | 818c2e1b9777599d333855330d94050b3432c8b7 (patch) | |
| tree | df85b289b7c0f797fbf5bf8ca5bca4422b387aa7 /vl.c | |
| parent | 4058fd98fd7e9c476774717adbd49698dd273166 (diff) | |
| parent | 7572150c189c6553c2448334116ab717680de66d (diff) | |
| download | qemu-818c2e1b9777599d333855330d94050b3432c8b7.zip | |
Merge branch 'spice.v23.pull' of git://anongit.freedesktop.org/spice/qemu
* 'spice.v23.pull' of git://anongit.freedesktop.org/spice/qemu:
vnc/spice: add set_passwd monitor command.
vnc: support password expire
vnc: auth reject cleanup
spice: add qmp 'query-spice' and hmp 'info spice' commands.
spice: connection events.
spice: add qxl device
spice: add qxl vgabios binary.
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1504,6 +1504,8 @@ static void select_vgahw (const char *p) vga_interface_type = VGA_VMWARE; } else if (strstart(p, "xenfb", &opts)) { vga_interface_type = VGA_XENFB; + } else if (strstart(p, "qxl", &opts)) { + vga_interface_type = VGA_QXL; } else if (!strstart(p, "none", &opts)) { invalid_vga: fprintf(stderr, "Unknown vga type: %s\n", p); @@ -3055,7 +3057,7 @@ int main(int argc, char **argv, char **envp) } } #ifdef CONFIG_SPICE - if (using_spice) { + if (using_spice && !qxl_enabled) { qemu_spice_display_init(ds); } #endif |