[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/12] qxl: don't assert on guest create_guest_prima
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 12/12] qxl: don't assert on guest create_guest_primary |
Date: |
Thu, 3 May 2012 10:53:46 +0200 |
From: Alon Levy <address@hidden>
Signed-off-by: Alon Levy <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/qxl.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
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 @@ 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);
--
1.7.1
- [Qemu-devel] [PULL 00/12] spice patch queue, Gerd Hoffmann, 2012/05/03
- [Qemu-devel] [PATCH 08/12] qxl: cleanup s/__FUNCTION__/__func__/, Gerd Hoffmann, 2012/05/03
- [Qemu-devel] [PATCH 12/12] qxl: don't assert on guest create_guest_primary,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 06/12] qxl: fix > 80 chars line, Gerd Hoffmann, 2012/05/03
- [Qemu-devel] [PATCH 02/12] spice_info: add mouse_mode, Gerd Hoffmann, 2012/05/03
- [Qemu-devel] [PATCH 05/12] qxl: replace panic with guest bug in qxl_track_command, Gerd Hoffmann, 2012/05/03
- [Qemu-devel] [PATCH 03/12] hw/qxl.c: qxl_phys2virt: replace panics with guest_bug, Gerd Hoffmann, 2012/05/03
- [Qemu-devel] [PATCH 07/12] qxl: don't abort on guest trigerrable ring indices mismatch, Gerd Hoffmann, 2012/05/03
- [Qemu-devel] [PATCH 10/12] qxl: qxl_add_memslot: remove guest trigerrable panics, Gerd Hoffmann, 2012/05/03
- [Qemu-devel] [PATCH 09/12] qxl: interface_notify_update: remove guest trigerrable abort, Gerd Hoffmann, 2012/05/03
- [Qemu-devel] [PATCH 11/12] qxl: ioport_write: remove guest trigerrable abort, Gerd Hoffmann, 2012/05/03
- [Qemu-devel] [PATCH 01/12] spice: require spice-protocol >= 0.8.1, Gerd Hoffmann, 2012/05/03
- [Qemu-devel] [PATCH 04/12] qxl: check for NULL return from qxl_phys2virt, Gerd Hoffmann, 2012/05/03