From a9257af0b9735dbf7e8a52b4bf8d6c80dd4fc446 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Wed, 28 Mar 2012 11:30:08 +0200 Subject: [PATCH 1/3] trace-events: remove unused qxl_vga_ioport_while_not_in_vga_mode The resulting stp file fails to load because of an unresolvable probe. Signed-off-by: Alon Levy Signed-off-by: Gerd Hoffmann --- trace-events | 1 - 1 file changed, 1 deletion(-) diff --git a/trace-events b/trace-events index a5f276d020..0e25d20e83 100644 --- a/trace-events +++ b/trace-events @@ -781,7 +781,6 @@ 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 surface, int offset, int size) "%d surface=%d offset=%d size=%d" -qxl_vga_ioport_while_not_in_vga_mode(int qid) "%d (int qid, reset to VGA mode because of VGA io)" # hw/qxl-render.c qxl_render_blit_guest_primary_initialized(void) "" From 79ce3567017e32ac96f7de7a8b04ed75ee710f89 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Thu, 29 Mar 2012 22:24:38 +0200 Subject: [PATCH 2/3] qxl: set default values of vram*_size_mb to -1 The addition of those values caused a regression where not specifying any value for the vram bar size would result in a 4096 _byte_ surface area. This is ok for the windows driver but causes the X driver to be unusable. Also, it's a regression. This patch returns the default behavior of having a 64 megabyte vram BAR. Signed-off-by: Alon Levy Signed-off-by: Gerd Hoffmann --- hw/qxl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 47a162e479..db2318e293 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -1959,8 +1959,8 @@ static Property qxl_properties[] = { DEFINE_PROP_UINT32("guestdebug", PCIQXLDevice, guestdebug, 0), DEFINE_PROP_UINT32("cmdlog", PCIQXLDevice, cmdlog, 0), DEFINE_PROP_UINT32("ram_size_mb", PCIQXLDevice, ram_size_mb, -1), - DEFINE_PROP_UINT32("vram_size_mb", PCIQXLDevice, vram32_size_mb, 0), - DEFINE_PROP_UINT32("vram64_size_mb", PCIQXLDevice, vram_size_mb, 0), + DEFINE_PROP_UINT32("vram_size_mb", PCIQXLDevice, vram32_size_mb, -1), + DEFINE_PROP_UINT32("vram64_size_mb", PCIQXLDevice, vram_size_mb, -1), DEFINE_PROP_END_OF_LIST(), }; From 06ddea49f8127bd055dbc7e83df896d9311c88cc Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Wed, 18 Apr 2012 12:27:00 +0300 Subject: [PATCH 3/3] qxl-render: fix broken vnc+spice since commit f934493 Notify any listeners such as vnc that the displaysurface has been changed, otherwise they will segfault when first accessing the freed old displaysurface data. Signed-off-by: Alon Levy Signed-off-by: Gerd Hoffmann --- hw/qxl-render.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/qxl-render.c b/hw/qxl-render.c index 28ab182226..f7f1bfda04 100644 --- a/hw/qxl-render.c +++ b/hw/qxl-render.c @@ -127,6 +127,7 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl) qxl->guest_primary.surface.width, qxl->guest_primary.surface.height); } + dpy_resize(vga->ds); } for (i = 0; i < qxl->num_dirty_rects; i++) { if (qemu_spice_rect_is_empty(qxl->dirty+i)) {