commit ddf9f4b707ca18adec4944a484caad1469c07c23
author Alon Levy <alevy@redhat.com> Wed Apr 25 12:43:31 2012 +0300
committer Gerd Hoffmann <kraxel@redhat.com> Thu May 03 10:45:04 2012 +0200
tree 372ee286c19a79bfd9bd03e8f3680ae92f32af0a
parent 4763e2cadd3b2ecfc41e83b99b88b8a68d2e6055

qxl: don't assert on guest create_guest_primary

Signed-off-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

hw/qxl.c

diff --git a/hw/qxl.c b/hw/qxl.c
index c614c91..6c11e70 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1191,7 +1191,10 @@
     QXLDevSurfaceCreate surface;
     QXLSurfaceCreate *sc = &qxl->guest_primary.surface;
 
-    assert(qxl->mode != QXL_MODE_NATIVE);
+    if (qxl->mode == QXL_MODE_NATIVE) {
+        qxl_guest_bug(qxl, "%s: nop since already in QXL_MODE_NATIVE",
+                      __func__);
+    }
     qxl_exit_vga_mode(qxl);
 
     surface.format     = le32_to_cpu(sc->format);