diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-11 14:46:26 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-11 14:46:26 -0500 |
| commit | d985bd4d55555a06c4239eadba4e367880e938ba (patch) | |
| tree | 22bc50f7a615498b5568baa39609471e236a14ba /hw | |
| parent | a640f07c0d03bfa3031af1fc0a32b0d779917d17 (diff) | |
| parent | c58c7b959b93b864a27fd6b3646ee1465ab8832b (diff) | |
| download | qemu-d985bd4d55555a06c4239eadba4e367880e938ba.tar.gz | |
Merge remote-tracking branch 'spice/spice.v73' into staging
# By Gerd Hoffmann (2) and Christophe Fergeau (1)
# Via Gerd Hoffmann
* spice/spice.v73:
qxl: fix local renderer
qxl: trace io port name
spice-core: Use g_strdup_printf instead of snprintf
Message-id: 1378807572-27902-1-git-send-email-kraxel@redhat.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/display/qxl-render.c | 15 | ||||
| -rw-r--r-- | hw/display/qxl.c | 5 |
2 files changed, 13 insertions, 7 deletions
diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c index 269b1a7568..d34b0c4170 100644 --- a/hw/display/qxl-render.c +++ b/hw/display/qxl-render.c @@ -31,10 +31,6 @@ static void qxl_blit(PCIQXLDevice *qxl, QXLRect *rect) if (is_buffer_shared(surface)) { return; } - if (!qxl->guest_primary.data) { - trace_qxl_render_blit_guest_primary_initialized(); - qxl->guest_primary.data = memory_region_get_ram_ptr(&qxl->vga.vram); - } trace_qxl_render_blit(qxl->guest_primary.qxl_stride, rect->left, rect->right, rect->top, rect->bottom); src = qxl->guest_primary.data; @@ -104,7 +100,12 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl) if (qxl->guest_primary.resized) { qxl->guest_primary.resized = 0; - qxl->guest_primary.data = memory_region_get_ram_ptr(&qxl->vga.vram); + qxl->guest_primary.data = qxl_phys2virt(qxl, + qxl->guest_primary.surface.mem, + MEMSLOT_GROUP_GUEST); + if (!qxl->guest_primary.data) { + return; + } qxl_set_rect_to_surface(qxl, &qxl->dirty[0]); qxl->num_dirty_rects = 1; trace_qxl_render_guest_primary_resized( @@ -128,6 +129,10 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl) } dpy_gfx_replace_surface(vga->con, surface); } + + if (!qxl->guest_primary.data) { + return; + } for (i = 0; i < qxl->num_dirty_rects; i++) { if (qemu_spice_rect_is_empty(qxl->dirty+i)) { break; diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 7649f2b1f4..c50e285e21 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -1541,8 +1541,9 @@ async_common: default: break; } - trace_qxl_io_write(d->id, qxl_mode_to_string(d->mode), addr, val, size, - async); + trace_qxl_io_write(d->id, qxl_mode_to_string(d->mode), + addr, io_port_to_string(addr), + val, size, async); switch (io_port) { case QXL_IO_UPDATE_AREA: |