From nobody Tue Apr 16 22:24:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1581524407044980.4301911695894; Wed, 12 Feb 2020 08:20:07 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-371-vP_UrpmbN7uv9gGZEMwKeg-1; Wed, 12 Feb 2020 11:19:28 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 60A368010F2; Wed, 12 Feb 2020 16:19:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2BB475DA88; Wed, 12 Feb 2020 16:19:21 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C248D8B2B0; Wed, 12 Feb 2020 16:19:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01CGIm7A030186 for ; Wed, 12 Feb 2020 11:18:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0511D60F8A; Wed, 12 Feb 2020 16:18:48 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-39.ams2.redhat.com [10.36.117.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F89360FC1; Wed, 12 Feb 2020 16:18:36 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D976F9CA7; Wed, 12 Feb 2020 17:18:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581524405; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=31dz9GiRQ4PDE/nDhDuPz2Klvu3+qgLjkLjr4ChUaCs=; b=IT8VXPv2H7w2OeIGzQOYbBALba1Se4dzIBKPccV+Cj2IF25fUxovKv4bxsnO+DaGE+Stj3 kWbU70XG7c506g5V5UUd+WxX+uzuFRGbVpgHNCS6QcQBJAVr0PxoNLsHUqRBiCyrp7dD1f UfAdK7+19H9mKhQLQPkSJ5i2L7bgt/U= From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 02/10] ui/gtk: Fix gd_refresh_rate_millihz() when widget window is not realized Date: Wed, 12 Feb 2020 17:18:27 +0100 Message-Id: <20200212161835.28576-3-kraxel@redhat.com> In-Reply-To: <20200212161835.28576-1-kraxel@redhat.com> References: <20200212161835.28576-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Peter Maydell , libvir-list@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Paolo Bonzini X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: vP_UrpmbN7uv9gGZEMwKeg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 gtk_widget_get_window() returns NULL if the widget's window is not realized, and QEMU crashes. Example under gtk 3.22.30 (mate 1.20.1): qemu-system-x86_64: Gdk: gdk_window_get_origin: assertion 'GDK_IS_WINDOW = (window)' failed (gdb) bt #0 0x00007ffff496cf70 in gdk_window_get_origin () from /usr/lib64/libgdk= -3.so.0 #1 0x00007ffff49582a0 in gdk_display_get_monitor_at_window () from /usr/= lib64/libgdk-3.so.0 #2 0x0000555555bb73e2 in gd_refresh_rate_millihz (window=3D0x5555579d628= 0) at ui/gtk.c:1973 #3 gd_vc_gfx_init (view_menu=3D0x5555579f0590, group=3D0x0, idx=3D0, con= =3D, vc=3D0x5555579d4a90, s=3D0x5555579d49f0) at ui/gtk.c:20= 48 #4 gd_create_menu_view (s=3D0x5555579d49f0) at ui/gtk.c:2149 #5 gd_create_menus (s=3D0x5555579d49f0) at ui/gtk.c:2188 #6 gtk_display_init (ds=3D, opts=3D0x55555661ed80 ) = at ui/gtk.c:2256 #7 0x000055555583d5a0 in main (argc=3D, argv=3D, envp=3D) at vl.c:4358 Fixes: c4c00922cc and 28b58f19d2 (display/gtk: get proper refreshrate) Reported-by: Jan Kiszka Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Jan Kiszka Message-id: 20200208161048.11311-3-f4bug@amsat.org Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index c59297ff4d2e..850c49bee02a 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1968,14 +1968,16 @@ static GtkWidget *gd_create_menu_machine(GtkDisplay= State *s) static int gd_refresh_rate_millihz(GtkWidget *window) { #ifdef GDK_VERSION_3_22 - GdkDisplay *dpy =3D gtk_widget_get_display(window); GdkWindow *win =3D gtk_widget_get_window(window); - GdkMonitor *monitor =3D gdk_display_get_monitor_at_window(dpy, win); =20 - return gdk_monitor_get_refresh_rate(monitor); -#else + if (win) { + GdkDisplay *dpy =3D gtk_widget_get_display(window); + GdkMonitor *monitor =3D gdk_display_get_monitor_at_window(dpy, win= ); + + return gdk_monitor_get_refresh_rate(monitor); + } +#endif return 0; -#endif } =20 static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc, --=20 2.18.2