qxl: don't assert() if device isn't yet initialized

[mirror_qemu.git] / hw / display / qxl.c

diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index af941fb0c209efc01ec17aa9370c709fc9b8f465..7bb00d68f572b36f04deff86e7c3e5c4c2f6c83a 100644 (file)
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -1591,7 +1591,10 @@ static void qxl_set_mode(PCIQXLDevice *d, unsigned int modenr, int loadvm)
     }
 
     d->guest_slots[0].slot = slot;
-    assert(qxl_add_memslot(d, 0, devmem, QXL_SYNC) == 0);
+    if (qxl_add_memslot(d, 0, devmem, QXL_SYNC) != 0) {
+        qxl_set_guest_bug(d, "device isn't initialized yet");
+        return;
+    }
 
     d->guest_primary.surface = surface;
     qxl_create_guest_primary(d, 0, QXL_SYNC);