diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-20 19:41:20 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-20 19:41:20 +0100 |
| commit | 518cb31fa7d2dd648bc400d68c25e0df8394683f (patch) | |
| tree | c9513a64fbb922c79f1c5f6846389843537b4cce | |
| parent | 46ca418d9f0de9bfe7180a598d57b5ab543cedf3 (diff) | |
| parent | e0127d2eec9cd5676ea9f3c47c2a7579a02c0466 (diff) | |
| download | qemu-518cb31fa7d2dd648bc400d68c25e0df8394683f.zip qemu-518cb31fa7d2dd648bc400d68c25e0df8394683f.tar.gz qemu-518cb31fa7d2dd648bc400d68c25e0df8394683f.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160720-1' into staging
qxl: fix qxl_set_dirty call in qxl_dirty_one_surface
# gpg: Signature made Wed 20 Jul 2016 12:28:01 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/pull-vga-20160720-1:
qxl: fix qxl_set_dirty call in qxl_dirty_one_surface
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/display/qxl.c | 11 | ||||
| -rw-r--r-- | hw/display/trace-events | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 46cc866..0e2682d 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -1816,16 +1816,17 @@ static void qxl_hw_update(void *opaque) static void qxl_dirty_one_surface(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, uint32_t height, int32_t stride) { - uint64_t offset; - uint32_t slot, size; + uint64_t offset, size; + uint32_t slot; bool rc; rc = qxl_get_check_slot_offset(qxl, pqxl, &slot, &offset); assert(rc == true); - size = height * abs(stride); - trace_qxl_surfaces_dirty(qxl->id, (int)offset, size); + size = (uint64_t)height * abs(stride); + trace_qxl_surfaces_dirty(qxl->id, offset, size); qxl_set_dirty(qxl->guest_slots[slot].mr, - qxl->guest_slots[slot].offset + offset, size); + qxl->guest_slots[slot].offset + offset, + qxl->guest_slots[slot].offset + offset + size); } static void qxl_dirty_surfaces(PCIQXLDevice *qxl) diff --git a/hw/display/trace-events b/hw/display/trace-events index 9dd82ce..78f04657 100644 --- a/hw/display/trace-events +++ b/hw/display/trace-events @@ -105,7 +105,7 @@ qxl_spice_reset_image_cache(int qid) "%d" qxl_spice_reset_memslots(int qid) "%d" qxl_spice_update_area(int qid, uint32_t surface_id, uint32_t left, uint32_t right, uint32_t top, uint32_t bottom) "%d sid=%d [%d,%d,%d,%d]" qxl_spice_update_area_rest(int qid, uint32_t num_dirty_rects, uint32_t clear_dirty_region) "%d #d=%d clear=%d" -qxl_surfaces_dirty(int qid, int offset, int size) "%d offset=%d size=%d" +qxl_surfaces_dirty(int qid, uint64_t offset, uint64_t size) "%d offset=0x%"PRIx64" size=0x%"PRIx64 qxl_send_events(int qid, uint32_t events) "%d %d" qxl_send_events_vm_stopped(int qid, uint32_t events) "%d %d" qxl_set_guest_bug(int qid) "%d" |