openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hw/qxl: s/qxl_guest_bug/qxl_set_guest_bug/ 

Signed-off-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Alon Levy 2012-05-24 12:38:12 +03:00 committed by Gerd Hoffmann
parent 160c31f78f
commit 0a530548a1
2 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
hw/qxl.c
View File

@ -30,7 +30,7 @@
/* /*
* NOTE: SPICE_RING_PROD_ITEM accesses memory on the pci bar and as * NOTE: SPICE_RING_PROD_ITEM accesses memory on the pci bar and as
* such can be changed by the guest, so to avoid a guest trigerrable * such can be changed by the guest, so to avoid a guest trigerrable
* abort we just set qxl_guest_bug and set the return to NULL. Still * abort we just qxl_set_guest_bug and set the return to NULL. Still
* it may happen as a result of emulator bug as well. * it may happen as a result of emulator bug as well.
*/ */
#undef SPICE_RING_PROD_ITEM #undef SPICE_RING_PROD_ITEM
@ -40,7 +40,7 @@
uint32_t prod = (r)->prod & SPICE_RING_INDEX_MASK(r); \ uint32_t prod = (r)->prod & SPICE_RING_INDEX_MASK(r); \
typeof(&(r)->items[prod]) m_item = &(r)->items[prod]; \ typeof(&(r)->items[prod]) m_item = &(r)->items[prod]; \
if (!((uint8_t*)m_item >= (uint8_t*)(start) && (uint8_t*)(m_item + 1) <= (uint8_t*)(end))) { \ if (!((uint8_t*)m_item >= (uint8_t*)(start) && (uint8_t*)(m_item + 1) <= (uint8_t*)(end))) { \
qxl_guest_bug(qxl, "SPICE_RING_PROD_ITEM indices mismatch " \ qxl_set_guest_bug(qxl, "SPICE_RING_PROD_ITEM indices mismatch " \
"! %p <= %p < %p", (uint8_t *)start, \ "! %p <= %p < %p", (uint8_t *)start, \
(uint8_t *)m_item, (uint8_t *)end); \ (uint8_t *)m_item, (uint8_t *)end); \
ret = NULL; \ ret = NULL; \
@ -56,7 +56,7 @@
uint32_t cons = (r)->cons & SPICE_RING_INDEX_MASK(r); \ uint32_t cons = (r)->cons & SPICE_RING_INDEX_MASK(r); \
typeof(&(r)->items[cons]) m_item = &(r)->items[cons]; \ typeof(&(r)->items[cons]) m_item = &(r)->items[cons]; \
if (!((uint8_t*)m_item >= (uint8_t*)(start) && (uint8_t*)(m_item + 1) <= (uint8_t*)(end))) { \ if (!((uint8_t*)m_item >= (uint8_t*)(start) && (uint8_t*)(m_item + 1) <= (uint8_t*)(end))) { \
qxl_guest_bug(qxl, "SPICE_RING_CONS_ITEM indices mismatch " \ qxl_set_guest_bug(qxl, "SPICE_RING_CONS_ITEM indices mismatch " \
"! %p <= %p < %p", (uint8_t *)start, \ "! %p <= %p < %p", (uint8_t *)start, \
(uint8_t *)m_item, (uint8_t *)end); \ (uint8_t *)m_item, (uint8_t *)end); \
ret = NULL; \ ret = NULL; \
@ -138,7 +138,7 @@ static void qxl_reset_memslots(PCIQXLDevice *d);
static void qxl_reset_surfaces(PCIQXLDevice *d); static void qxl_reset_surfaces(PCIQXLDevice *d);
static void qxl_ring_set_dirty(PCIQXLDevice *qxl); static void qxl_ring_set_dirty(PCIQXLDevice *qxl);
void qxl_guest_bug(PCIQXLDevice *qxl, const char *msg, ...) void qxl_set_guest_bug(PCIQXLDevice *qxl, const char *msg, ...)
{ {
qxl_send_events(qxl, QXL_INTERRUPT_ERROR); qxl_send_events(qxl, QXL_INTERRUPT_ERROR);
if (qxl->guestdebug) { if (qxl->guestdebug) {
@ -411,7 +411,8 @@ static int qxl_track_command(PCIQXLDevice *qxl, struct QXLCommandExt *ext)
uint32_t id = le32_to_cpu(cmd->surface_id); uint32_t id = le32_to_cpu(cmd->surface_id);
if (id >= NUM_SURFACES) { if (id >= NUM_SURFACES) {
qxl_guest_bug(qxl, "QXL_CMD_SURFACE id %d >= %d", id, NUM_SURFACES); qxl_set_guest_bug(qxl, "QXL_CMD_SURFACE id %d >= %d", id,
NUM_SURFACES);
return 1; return 1;
} }
qemu_mutex_lock(&qxl->track_lock); qemu_mutex_lock(&qxl->track_lock);
@ -1061,12 +1062,12 @@ static int 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); trace_qxl_memslot_add_guest(d->id, slot_id, guest_start, guest_end);
if (slot_id >= NUM_MEMSLOTS) { if (slot_id >= NUM_MEMSLOTS) {
qxl_guest_bug(d, "%s: slot_id >= NUM_MEMSLOTS %d >= %d", __func__, qxl_set_guest_bug(d, "%s: slot_id >= NUM_MEMSLOTS %d >= %d", __func__,
slot_id, NUM_MEMSLOTS); slot_id, NUM_MEMSLOTS);
return 1; return 1;
} }
if (guest_start > guest_end) { if (guest_start > guest_end) {
qxl_guest_bug(d, "%s: guest_start > guest_end 0x%" PRIx64 qxl_set_guest_bug(d, "%s: guest_start > guest_end 0x%" PRIx64
" > 0x%" PRIx64, __func__, guest_start, guest_end); " > 0x%" PRIx64, __func__, guest_start, guest_end);
return 1; return 1;
} }
@ -1091,7 +1092,7 @@ static int qxl_add_memslot(PCIQXLDevice *d, uint32_t slot_id, uint64_t delta,
break; break;
} }
if (i == ARRAY_SIZE(regions)) { if (i == ARRAY_SIZE(regions)) {
qxl_guest_bug(d, "%s: finished loop without match", __func__); qxl_set_guest_bug(d, "%s: finished loop without match", __func__);
return 1; return 1;
} }
@ -1105,7 +1106,7 @@ static int qxl_add_memslot(PCIQXLDevice *d, uint32_t slot_id, uint64_t delta,
break; break;
default: default:
/* should not happen */ /* should not happen */
qxl_guest_bug(d, "%s: pci_region = %d", __func__, pci_region); qxl_set_guest_bug(d, "%s: pci_region = %d", __func__, pci_region);
return 1; return 1;
} }
@ -1156,21 +1157,24 @@ void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, int group_id)
return (void *)(intptr_t)offset; return (void *)(intptr_t)offset;
case MEMSLOT_GROUP_GUEST: case MEMSLOT_GROUP_GUEST:
if (slot >= NUM_MEMSLOTS) { if (slot >= NUM_MEMSLOTS) {
qxl_guest_bug(qxl, "slot too large %d >= %d", slot, NUM_MEMSLOTS); qxl_set_guest_bug(qxl, "slot too large %d >= %d", slot,
NUM_MEMSLOTS);
return NULL; return NULL;
} }
if (!qxl->guest_slots[slot].active) { if (!qxl->guest_slots[slot].active) {
qxl_guest_bug(qxl, "inactive slot %d\n", slot); qxl_set_guest_bug(qxl, "inactive slot %d\n", slot);
return NULL; return NULL;
} }
if (offset < qxl->guest_slots[slot].delta) { if (offset < qxl->guest_slots[slot].delta) {
qxl_guest_bug(qxl, "slot %d offset %"PRIu64" < delta %"PRIu64"\n", qxl_set_guest_bug(qxl,
"slot %d offset %"PRIu64" < delta %"PRIu64"\n",
slot, offset, qxl->guest_slots[slot].delta); slot, offset, qxl->guest_slots[slot].delta);
return NULL; return NULL;
} }
offset -= qxl->guest_slots[slot].delta; offset -= qxl->guest_slots[slot].delta;
if (offset > qxl->guest_slots[slot].size) { if (offset > qxl->guest_slots[slot].size) {
qxl_guest_bug(qxl, "slot %d offset %"PRIu64" > size %"PRIu64"\n", qxl_set_guest_bug(qxl,
"slot %d offset %"PRIu64" > size %"PRIu64"\n",
slot, offset, qxl->guest_slots[slot].size); slot, offset, qxl->guest_slots[slot].size);
return NULL; return NULL;
} }
@ -1192,7 +1196,7 @@ static void qxl_create_guest_primary(PCIQXLDevice *qxl, int loadvm,
QXLSurfaceCreate *sc = &qxl->guest_primary.surface; QXLSurfaceCreate *sc = &qxl->guest_primary.surface;
if (qxl->mode == QXL_MODE_NATIVE) { if (qxl->mode == QXL_MODE_NATIVE) {
qxl_guest_bug(qxl, "%s: nop since already in QXL_MODE_NATIVE", qxl_set_guest_bug(qxl, "%s: nop since already in QXL_MODE_NATIVE",
__func__); __func__);
} }
qxl_exit_vga_mode(qxl); qxl_exit_vga_mode(qxl);
@ -1342,7 +1346,7 @@ async_common:
async = QXL_ASYNC; async = QXL_ASYNC;
qemu_mutex_lock(&d->async_lock); qemu_mutex_lock(&d->async_lock);
if (d->current_async != QXL_UNDEFINED_IO) { if (d->current_async != QXL_UNDEFINED_IO) {
qxl_guest_bug(d, "%d async started before last (%d) complete", qxl_set_guest_bug(d, "%d async started before last (%d) complete",
io_port, d->current_async); io_port, d->current_async);
qemu_mutex_unlock(&d->async_lock); qemu_mutex_unlock(&d->async_lock);
return; return;
@ -1403,11 +1407,12 @@ async_common:
break; break;
case QXL_IO_MEMSLOT_ADD: case QXL_IO_MEMSLOT_ADD:
if (val >= NUM_MEMSLOTS) { if (val >= NUM_MEMSLOTS) {
qxl_guest_bug(d, "QXL_IO_MEMSLOT_ADD: val out of range"); qxl_set_guest_bug(d, "QXL_IO_MEMSLOT_ADD: val out of range");
break; break;
} }
if (d->guest_slots[val].active) { if (d->guest_slots[val].active) {
qxl_guest_bug(d, "QXL_IO_MEMSLOT_ADD: memory slot already active"); qxl_set_guest_bug(d,
"QXL_IO_MEMSLOT_ADD: memory slot already active");
break; break;
} }
d->guest_slots[val].slot = d->ram->mem_slot; d->guest_slots[val].slot = d->ram->mem_slot;
@ -1415,14 +1420,14 @@ async_common:
break; break;
case QXL_IO_MEMSLOT_DEL: case QXL_IO_MEMSLOT_DEL:
if (val >= NUM_MEMSLOTS) { if (val >= NUM_MEMSLOTS) {
qxl_guest_bug(d, "QXL_IO_MEMSLOT_DEL: val out of range"); qxl_set_guest_bug(d, "QXL_IO_MEMSLOT_DEL: val out of range");
break; break;
} }
qxl_del_memslot(d, val); qxl_del_memslot(d, val);
break; break;
case QXL_IO_CREATE_PRIMARY: case QXL_IO_CREATE_PRIMARY:
if (val != 0) { if (val != 0) {
qxl_guest_bug(d, "QXL_IO_CREATE_PRIMARY (async=%d): val != 0", qxl_set_guest_bug(d, "QXL_IO_CREATE_PRIMARY (async=%d): val != 0",
async); async);
goto cancel_async; goto cancel_async;
} }
@ -1431,7 +1436,7 @@ async_common:
break; break;
case QXL_IO_DESTROY_PRIMARY: case QXL_IO_DESTROY_PRIMARY:
if (val != 0) { if (val != 0) {
qxl_guest_bug(d, "QXL_IO_DESTROY_PRIMARY (async=%d): val != 0", qxl_set_guest_bug(d, "QXL_IO_DESTROY_PRIMARY (async=%d): val != 0",
async); async);
goto cancel_async; goto cancel_async;
} }
@ -1443,7 +1448,7 @@ async_common:
break; break;
case QXL_IO_DESTROY_SURFACE_WAIT: case QXL_IO_DESTROY_SURFACE_WAIT:
if (val >= NUM_SURFACES) { if (val >= NUM_SURFACES) {
qxl_guest_bug(d, "QXL_IO_DESTROY_SURFACE (async=%d):" qxl_set_guest_bug(d, "QXL_IO_DESTROY_SURFACE (async=%d):"
"%" PRIu64 " >= NUM_SURFACES", async, val); "%" PRIu64 " >= NUM_SURFACES", async, val);
goto cancel_async; goto cancel_async;
} }
@ -1467,7 +1472,7 @@ async_common:
qxl_spice_destroy_surfaces(d, async); qxl_spice_destroy_surfaces(d, async);
break; break;
default: default:
qxl_guest_bug(d, "%s: unexpected ioport=0x%x\n", __func__, io_port); qxl_set_guest_bug(d, "%s: unexpected ioport=0x%x\n", __func__, io_port);
} }
return; return;
cancel_async: cancel_async:

3
hw/qxl.h
View File

@ -127,7 +127,8 @@ typedef struct PCIQXLDevice {
/* qxl.c */ /* qxl.c */
void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id); void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id);
void qxl_guest_bug(PCIQXLDevice *qxl, const char *msg, ...) GCC_FMT_ATTR(2, 3); void qxl_set_guest_bug(PCIQXLDevice *qxl, const char *msg, ...)
GCC_FMT_ATTR(2, 3);
void qxl_spice_update_area(PCIQXLDevice *qxl, uint32_t surface_id, void qxl_spice_update_area(PCIQXLDevice *qxl, uint32_t surface_id,
struct QXLRect *area, struct QXLRect *dirty_rects, struct QXLRect *area, struct QXLRect *dirty_rects,