From: Alon Levy <alevy@redhat.com>
Date: Wed, 25 Apr 2012 09:43:31 +0000 (+0300)
Subject: qxl: don't assert on guest create_guest_primary
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ddf9f4b707ca18adec4944a484caad1469c07c23;p=qemu.git

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>
---

diff --git a/hw/qxl.c b/hw/qxl.c
index c614c912e2..6c11e70049 100644
--- 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);