Commit 879367ef authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 38ebb396 0a2b5e3a

hw/display/qxl.c

+3 −0
Original line number Diff line number Diff line
@@ -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);