From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmOUt-0007Sd-IK for qemu-devel@nongnu.org; Tue, 20 Sep 2016 13:06:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmOUp-0007Vt-9N for qemu-devel@nongnu.org; Tue, 20 Sep 2016 13:06:19 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:39972) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmOUo-0007Um-Ut for qemu-devel@nongnu.org; Tue, 20 Sep 2016 13:06:15 -0400 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u8KH3L8Q107663 for ; Tue, 20 Sep 2016 13:06:14 -0400 Received: from e31.co.us.ibm.com (e31.co.us.ibm.com [32.97.110.149]) by mx0a-001b2d01.pphosted.com with ESMTP id 25k0w3vtbe-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 20 Sep 2016 13:06:14 -0400 Received: from localhost by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 20 Sep 2016 11:06:13 -0600 From: Michael Roth Date: Tue, 20 Sep 2016 12:05:18 -0500 In-Reply-To: <1474391141-16623-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1474391141-16623-1-git-send-email-mdroth@linux.vnet.ibm.com> Message-Id: <1474391141-16623-3-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 02/25] ui: fix refresh of VNC server surface List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, "Daniel P. Berrange" , Peter Maydell From: "Daniel P. Berrange" In previous commit commit c7628bff4138ce906a3620d12e0820c1cf6c140d Author: Gerd Hoffmann Date: Fri Oct 30 12:10:09 2015 +0100 vnc: only alloc server surface with clients connected the VNC server was changed so that the 'vd->server' pixman image was only allocated when a client is connected. Since then if a client disconnects and then reconnects to the VNC server all they will see is a black screen until they do something that triggers a refresh. On a graphical desktop this is not often noticed since there's many things going on which cause a refresh. On a plain text console it is really obvious since nothing refreshes frequently. The problem is that the VNC server didn't update the guest dirty bitmap, so still believes its server image is in sync with the guest contents. To fix this we must explicitly mark the entire guest desktop as dirty after re-creating the server surface. Move this logic into vnc_update_server_surface() so it is guaranteed to be call in all code paths that re-create the surface instead of only in vnc_dpy_switch() Signed-off-by: Daniel P. Berrange Reviewed-by: Peter Lieven Tested-by: Peter Lieven Message-id: 1471365032-18096-1-git-send-email-berrange@redhat.com Signed-off-by: Peter Maydell (cherry picked from commit b69a553b4af9bc87a8b2e0a7b7a7de4cc7f0557e) Signed-off-by: Michael Roth --- ui/vnc.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 3e89dad..78a586f 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -687,6 +687,8 @@ void *vnc_server_fb_ptr(VncDisplay *vd, int x, int y) static void vnc_update_server_surface(VncDisplay *vd) { + int width, height; + qemu_pixman_image_unref(vd->server); vd->server = NULL; @@ -694,10 +696,15 @@ static void vnc_update_server_surface(VncDisplay *vd) return; } + width = vnc_width(vd); + height = vnc_height(vd); vd->server = pixman_image_create_bits(VNC_SERVER_FB_FORMAT, - vnc_width(vd), - vnc_height(vd), + width, height, NULL, 0); + + memset(vd->guest.dirty, 0x00, sizeof(vd->guest.dirty)); + vnc_set_area_dirty(vd->guest.dirty, vd, 0, 0, + width, height); } static void vnc_dpy_switch(DisplayChangeListener *dcl, @@ -705,7 +712,6 @@ static void vnc_dpy_switch(DisplayChangeListener *dcl, { VncDisplay *vd = container_of(dcl, VncDisplay, dcl); VncState *vs; - int width, height; vnc_abort_display_jobs(vd); vd->ds = surface; @@ -717,11 +723,6 @@ static void vnc_dpy_switch(DisplayChangeListener *dcl, qemu_pixman_image_unref(vd->guest.fb); vd->guest.fb = pixman_image_ref(surface->image); vd->guest.format = surface->format; - width = vnc_width(vd); - height = vnc_height(vd); - memset(vd->guest.dirty, 0x00, sizeof(vd->guest.dirty)); - vnc_set_area_dirty(vd->guest.dirty, vd, 0, 0, - width, height); QTAILQ_FOREACH(vs, &vd->clients, next) { vnc_colordepth(vs); @@ -731,7 +732,8 @@ static void vnc_dpy_switch(DisplayChangeListener *dcl, } memset(vs->dirty, 0x00, sizeof(vs->dirty)); vnc_set_area_dirty(vs->dirty, vd, 0, 0, - width, height); + vnc_width(vd), + vnc_height(vd)); } } -- 1.9.1