From patchwork Thu Nov 9 07:37:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 836212 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yXZm43cWLz9t2R for ; Thu, 9 Nov 2017 18:38:39 +1100 (AEDT) Received: from localhost ([::1]:35600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eChQ4-0000DG-4B for incoming@patchwork.ozlabs.org; Thu, 09 Nov 2017 02:38:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eChPg-0000Co-BV for qemu-devel@nongnu.org; Thu, 09 Nov 2017 02:38:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eChPd-0001zl-5O for qemu-devel@nongnu.org; Thu, 09 Nov 2017 02:38:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46514) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eChPc-0001zJ-VX for qemu-devel@nongnu.org; Thu, 09 Nov 2017 02:38:09 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D26B55D9EA for ; Thu, 9 Nov 2017 07:38:07 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-41.ams2.redhat.com [10.36.116.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1AFDF60BE3; Thu, 9 Nov 2017 07:38:04 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 39812409D2; Thu, 9 Nov 2017 08:38:04 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 9 Nov 2017 08:37:59 +0100 Message-Id: <20171109073759.5910-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 09 Nov 2017 07:38:07 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] ui: fix dcl unregister X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" register checks for dcl->ds being NULL, to avoid registering the same dcl twice. Therefore dcl->ds must be cleared on unregister, otherwise un-registering and re-registering doesn't work. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1510809 Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-André Lureau --- ui/console.c | 1 + ui/vnc.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ui/console.c b/ui/console.c index eca854cbd5..c4c95abed7 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1471,6 +1471,7 @@ void unregister_displaychangelistener(DisplayChangeListener *dcl) dcl->con->dcls--; } QLIST_REMOVE(dcl, next); + dcl->ds = NULL; gui_setup_refresh(ds); } diff --git a/ui/vnc.c b/ui/vnc.c index 9f8d5a1b1f..bd46f11fcc 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3044,6 +3044,7 @@ void vnc_display_init(const char *id) { VncDisplay *vd; + fprintf(stderr, "%s: %s\n", __func__, id); if (vnc_display_find(id) != NULL) { return; } @@ -3982,6 +3983,7 @@ void vnc_display_open(const char *id, Error **errp) } if (con != vd->dcl.con) { + fprintf(stderr, "%s: %s\n", __func__, id); unregister_displaychangelistener(&vd->dcl); vd->dcl.con = con; register_displaychangelistener(&vd->dcl);