[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/12] qxl: replace panic with guest bug in qxl_trac
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 05/12] qxl: replace panic with guest bug in qxl_track_command |
Date: |
Thu, 26 Apr 2012 10:42:31 +0200 |
From: Alon Levy <address@hidden>
Signed-off-by: Alon Levy <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/qxl.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/hw/qxl.c b/hw/qxl.c
index b6a738e..8b66cbb 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -394,7 +394,11 @@ static int qxl_track_command(PCIQXLDevice *qxl, struct
QXLCommandExt *ext)
return 1;
}
uint32_t id = le32_to_cpu(cmd->surface_id);
- PANIC_ON(id >= NUM_SURFACES);
+
+ if (id >= NUM_SURFACES) {
+ qxl_guest_bug(qxl, "QXL_CMD_SURFACE id %d >= %d", id,
NUM_SURFACES);
+ return 1;
+ }
qemu_mutex_lock(&qxl->track_lock);
if (cmd->type == QXL_SURFACE_CMD_CREATE) {
qxl->guest_surfaces.cmds[id] = ext->cmd.data;
--
1.7.1
- [Qemu-devel] [PATCH 00/12] spice patch queue, Gerd Hoffmann, 2012/04/26
- [Qemu-devel] [PATCH 02/12] spice_info: add mouse_mode, Gerd Hoffmann, 2012/04/26
- [Qemu-devel] [PATCH 03/12] hw/qxl.c: qxl_phys2virt: replace panics with guest_bug, Gerd Hoffmann, 2012/04/26
- [Qemu-devel] [PATCH 01/12] spice: require spice-protocol >= 0.8.1, Gerd Hoffmann, 2012/04/26
- [Qemu-devel] [PATCH 05/12] qxl: replace panic with guest bug in qxl_track_command,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 11/12] qxl: ioport_write: remove guest trigerrable abort, Gerd Hoffmann, 2012/04/26
- [Qemu-devel] [PATCH 04/12] qxl: check for NULL return from qxl_phys2virt, Gerd Hoffmann, 2012/04/26
- [Qemu-devel] [PATCH 10/12] qxl: qxl_add_memslot: remove guest trigerrable panics, Gerd Hoffmann, 2012/04/26
- [Qemu-devel] [PATCH 06/12] qxl: fix > 80 chars line, Gerd Hoffmann, 2012/04/26
- [Qemu-devel] [PATCH 07/12] qxl: don't abort on guest trigerrable ring indices mismatch, Gerd Hoffmann, 2012/04/26
- [Qemu-devel] [PATCH 12/12] qxl: don't assert on guest create_guest_primary, Gerd Hoffmann, 2012/04/26
- [Qemu-devel] [PATCH 08/12] qxl: cleanup s/__FUNCTION__/__func__/, Gerd Hoffmann, 2012/04/26
- [Qemu-devel] [PATCH 09/12] qxl: interface_notify_update: remove guest trigerrable abort, Gerd Hoffmann, 2012/04/26