From nobody Sat May 18 11:26:02 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1694777856; cv=none; d=zohomail.com; s=zohoarc; b=JXynBxR1EkF5wb1zA72L+JtmUQm4lIfNtDafzTFkbe28dPtZedqLU7r0CkzxYwqClRyjPGpkk6oPklRx1aXaXBmHXGLcN31vkIfQ0GEzrXV+iXCgP5NhNULDCD6Unre3oguu+OWKCtaHsyJYRCz/h8m7bPpavHGlQNd6oDjely0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694777856; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=7IGeMDOpNPhNwz11y08u7g3J1IV5gXBceztBJSixWAA=; b=UrHXG3fMoiknfkdaCc0K39Ajf4FPUZvtGkofYiituLzvEns9fZe/4w2QNZ9RWL7ZxtCn84I9+VKNpjoC+aUnTaY8IfQXdIOO+QPyWazptDp9SAx7PbIlv6IJsktwU/kH8zqMNd7cef0KTEfDttx5PgwNGtOuCea+tkMw/MigbZQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1694777856046631.1401391942992; Fri, 15 Sep 2023 04:37:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qh78I-0008R6-87; Fri, 15 Sep 2023 07:37:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qh77z-0008PM-Lp for qemu-devel@nongnu.org; Fri, 15 Sep 2023 07:36:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qh77x-0001bb-LZ for qemu-devel@nongnu.org; Fri, 15 Sep 2023 07:36:51 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-282-daEDCVS2PlaHQSxUhJVIkA-1; Fri, 15 Sep 2023 07:36:47 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C16C18039C8 for ; Fri, 15 Sep 2023 11:36:46 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id B53B2200BFE3; Fri, 15 Sep 2023 11:36:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694777808; h=from:from: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; bh=7IGeMDOpNPhNwz11y08u7g3J1IV5gXBceztBJSixWAA=; b=SEr0DvF1RrTLZsFaQl7jOA8F5kd5mLxj/FpQqLQincmvt8dtpw8cGThc3rQYGhlFwkRWd5 ZvKsLky1Hh867Ygn+cmY1eC/j/4y9L51gQJ06FVNOiVqsQr5hrKak52dLxforWUmDrdOnR GyfrC/avLa879ckGSZ9j3IGutRRbARw= X-MC-Unique: daEDCVS2PlaHQSxUhJVIkA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: berrange@redhat.com, kraxel@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH] ui/gtk: fix UI info precondition Date: Fri, 15 Sep 2023 15:36:37 +0400 Message-ID: <20230915113637.2127644-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694777858066100001 From: Marc-Andr=C3=A9 Lureau dpy_get_ui_info() shouldn't be called if the underlying GPU doesn't support it. Before the assert() was added and the regression introduced, GTK code used to get "zero" UI info, for ex with a simple VGA device. The assert was added to prevent from calling when there are no console too. The other display backend that calls dpy_get_ui_info() correctly checks that pre-condition. Calling dpy_set_ui_info() is "safe" in this case, it will simply return an error that can be generally ignored. Fixes: commit a92e7bb4c ("ui: add precondition for dpy_get_ui_info()") Signed-off-by: Marc-Andr=C3=A9 Lureau --- ui/gtk.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ui/gtk.c b/ui/gtk.c index e09f97a86b..7b542da0c0 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -726,6 +726,10 @@ static void gd_set_ui_refresh_rate(VirtualConsole *vc,= int refresh_rate) { QemuUIInfo info; =20 + if (!dpy_ui_info_supported(vc->gfx.dcl.con)) { + return; + } + info =3D *dpy_get_ui_info(vc->gfx.dcl.con); info.refresh_rate =3D refresh_rate; dpy_set_ui_info(vc->gfx.dcl.con, &info, true); @@ -735,6 +739,10 @@ static void gd_set_ui_size(VirtualConsole *vc, gint wi= dth, gint height) { QemuUIInfo info; =20 + if (!dpy_ui_info_supported(vc->gfx.dcl.con)) { + return; + } + info =3D *dpy_get_ui_info(vc->gfx.dcl.con); info.width =3D width; info.height =3D height; --=20 2.41.0