[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/12] qxl: qxl_add_memslot: remove guest trigerrabl
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 10/12] qxl: qxl_add_memslot: remove guest trigerrable panics |
Date: |
Thu, 3 May 2012 10:53:44 +0200 |
From: Alon Levy <address@hidden>
Signed-off-by: Alon Levy <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/qxl.c | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/hw/qxl.c b/hw/qxl.c
index 44ee495..44a167a 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1038,8 +1038,8 @@ static const MemoryRegionPortio qxl_vga_portio_list[] = {
PORTIO_END_OF_LIST(),
};
-static void qxl_add_memslot(PCIQXLDevice *d, uint32_t slot_id, uint64_t delta,
- qxl_async_io async)
+static int qxl_add_memslot(PCIQXLDevice *d, uint32_t slot_id, uint64_t delta,
+ qxl_async_io async)
{
static const int regions[] = {
QXL_RAM_RANGE_INDEX,
@@ -1060,8 +1060,16 @@ static void qxl_add_memslot(PCIQXLDevice *d, uint32_t
slot_id, uint64_t delta,
trace_qxl_memslot_add_guest(d->id, slot_id, guest_start, guest_end);
- PANIC_ON(slot_id >= NUM_MEMSLOTS);
- PANIC_ON(guest_start > guest_end);
+ if (slot_id >= NUM_MEMSLOTS) {
+ qxl_guest_bug(d, "%s: slot_id >= NUM_MEMSLOTS %d >= %d", __func__,
+ slot_id, NUM_MEMSLOTS);
+ return 1;
+ }
+ if (guest_start > guest_end) {
+ qxl_guest_bug(d, "%s: guest_start > guest_end 0x%" PRIx64
+ " > 0x%" PRIx64, __func__, guest_start, guest_end);
+ return 1;
+ }
for (i = 0; i < ARRAY_SIZE(regions); i++) {
pci_region = regions[i];
@@ -1082,7 +1090,10 @@ static void qxl_add_memslot(PCIQXLDevice *d, uint32_t
slot_id, uint64_t delta,
/* passed */
break;
}
- PANIC_ON(i == ARRAY_SIZE(regions)); /* finished loop without match */
+ if (i == ARRAY_SIZE(regions)) {
+ qxl_guest_bug(d, "%s: finished loop without match", __func__);
+ return 1;
+ }
switch (pci_region) {
case QXL_RAM_RANGE_INDEX:
@@ -1094,7 +1105,8 @@ static void qxl_add_memslot(PCIQXLDevice *d, uint32_t
slot_id, uint64_t delta,
break;
default:
/* should not happen */
- abort();
+ qxl_guest_bug(d, "%s: pci_region = %d", __func__, pci_region);
+ return 1;
}
memslot.slot_id = slot_id;
@@ -1110,6 +1122,7 @@ static void qxl_add_memslot(PCIQXLDevice *d, uint32_t
slot_id, uint64_t delta,
d->guest_slots[slot_id].size = memslot.virt_end - memslot.virt_start;
d->guest_slots[slot_id].delta = delta;
d->guest_slots[slot_id].active = 1;
+ return 0;
}
static void qxl_del_memslot(PCIQXLDevice *d, uint32_t slot_id)
@@ -1250,7 +1263,7 @@ static void qxl_set_mode(PCIQXLDevice *d, int modenr, int
loadvm)
}
d->guest_slots[0].slot = slot;
- qxl_add_memslot(d, 0, devmem, QXL_SYNC);
+ assert(qxl_add_memslot(d, 0, devmem, QXL_SYNC) == 0);
d->guest_primary.surface = surface;
qxl_create_guest_primary(d, 0, QXL_SYNC);
--
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, 2012/05/03
- [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 <=
- [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
- Re: [Qemu-devel] [PULL 00/12] spice patch queue, Anthony Liguori, 2012/05/08