summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2012-04-25 12:43:31 +0300
committerGerd Hoffmann <kraxel@redhat.com>2012-05-03 10:45:04 +0200
commitddf9f4b707ca18adec4944a484caad1469c07c23 (patch)
tree372ee286c19a79bfd9bd03e8f3680ae92f32af0a /hw
parent4763e2cadd3b2ecfc41e83b99b88b8a68d2e6055 (diff)
downloadqemu-ddf9f4b707ca18adec4944a484caad1469c07c23.zip
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>
Diffstat (limited to 'hw')
-rw-r--r--hw/qxl.c5
1 files changed, 4 insertions, 1 deletions
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);