diff options
| author | Anthony Liguori | 2013-05-13 16:44:04 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-05-13 16:44:04 +0200 |
| commit | 879367efba1f2e9733ff76d03041324b5b76f645 (patch) | |
| tree | 07c6308b1cf64782277a71ea7de94722436df32e | |
| parent | target-i386: ROR r8/r16 imm instruction fix (diff) | |
| parent | qxl: Call spice_qxl_driver_unload from qxl_enter_vga_mode (diff) | |
| download | qemu-879367efba1f2e9733ff76d03041324b5b76f645.tar.gz qemu-879367efba1f2e9733ff76d03041324b5b76f645.tar.xz qemu-879367efba1f2e9733ff76d03041324b5b76f645.zip | |
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>
| -rw-r--r-- | hw/display/qxl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 2d49e9a720..c475cb10dc 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -1077,6 +1077,9 @@ static void qxl_enter_vga_mode(PCIQXLDevice *d) return; } 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); d->mode = QXL_MODE_VGA; vga_dirty_log_start(&d->vga); |