qxl: don't assert on guest create_guest_primary
authorAlon Levy <alevy@redhat.com>
Wed, 25 Apr 2012 09:43:31 +0000 (12:43 +0300)
committerGerd Hoffmann <kraxel@redhat.com>
Thu, 3 May 2012 08:45:04 +0000 (10:45 +0200)
Signed-off-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
hw/qxl.c

index c614c912e249f8a47dc0395136237a35a688794a..6c11e700493051c7837b076e2ce919b5e5e7e446 100644 (file)
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1191,7 +1191,10 @@ static void qxl_create_guest_primary(PCIQXLDevice *qxl, int loadvm,
     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);