mirror of
https://git.proxmox.com/git/qemu
synced 2025-07-09 08:42:32 +00:00
Merge remote-tracking branch 'spice/spice.v70' into staging
# By Hans de Goede # Via Gerd Hoffmann * spice/spice.v70: qxl: Call spice_qxl_driver_unload from qxl_enter_vga_mode Message-id: 1368093776-8949-1-git-send-email-kraxel@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
commit
879367efba
@ -1077,6 +1077,9 @@ static void qxl_enter_vga_mode(PCIQXLDevice *d)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
trace_qxl_enter_vga_mode(d->id);
|
trace_qxl_enter_vga_mode(d->id);
|
||||||
|
#if SPICE_SERVER_VERSION >= 0x000c03 /* release 0.12.3 */
|
||||||
|
spice_qxl_driver_unload(&d->ssd.qxl);
|
||||||
|
#endif
|
||||||
qemu_spice_create_host_primary(&d->ssd);
|
qemu_spice_create_host_primary(&d->ssd);
|
||||||
d->mode = QXL_MODE_VGA;
|
d->mode = QXL_MODE_VGA;
|
||||||
vga_dirty_log_start(&d->vga);
|
vga_dirty_log_start(&d->vga);
|
||||||
|
Loading…
Reference in New Issue
Block a user