From nobody Sun Dec 14 12:14:53 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1764754725743930.6613487071658; Wed, 3 Dec 2025 01:38:45 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vQjHl-0000Mb-GM; Wed, 03 Dec 2025 04:36:33 -0500 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 1vQjHj-0000J1-Oy; Wed, 03 Dec 2025 04:36:31 -0500 Received: from isrv.corpit.ru ([212.248.84.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vQjHi-00075l-2f; Wed, 03 Dec 2025 04:36:31 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id C096A1708B4; Wed, 03 Dec 2025 12:35:54 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id ABEFB32B5AB; Wed, 03 Dec 2025 12:36:12 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, "AlanoSong@163.com" , =?UTF-8?q?Marc-Andr=C3=A9Lureau?= , Michael Tokarev Subject: [Stable-10.1.3 85/96] ui/vnc: Fix qemu abort when query vnc info Date: Wed, 3 Dec 2025 12:35:18 +0300 Message-ID: <20251203093612.2370716-9-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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-ZM-MESSAGEID: 1764754726431019200 From: "AlanoSong@163.com" When there is no display device on qemu machine, and user only access qemu by remote vnc. At the same time user input `info vnc` by QMP, the qemu will abort. To avoid the abort above, I add display device check, when query vnc info in qmp_query_vnc_servers(). Reviewed-by: Marc-Andr=C3=A9Lureau Signed-off-by: Alano Song [ Marc-Andr=C3=A9 - removed useless Error *err ] Signed-off-by: Marc-Andr=C3=A9 Lureau Message-ID: <20251125131955.7024-1-AlanoSong@163.com> (cherry picked from commit 4c1646e23f761e3dc6d88c8995f13be8f668a012) Signed-off-by: Michael Tokarev diff --git a/ui/vnc.c b/ui/vnc.c index 9054fc8125..88e55ca797 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -555,9 +555,12 @@ VncInfo2List *qmp_query_vnc_servers(Error **errp) qmp_query_auth(vd->auth, vd->subauth, &info->auth, &info->vencrypt, &info->has_vencrypt); if (vd->dcl.con) { - dev =3D DEVICE(object_property_get_link(OBJECT(vd->dcl.con), - "device", &error_abort)); - info->display =3D g_strdup(dev->id); + Object *obj =3D object_property_get_link(OBJECT(vd->dcl.con), + "device", NULL); + if (obj) { + dev =3D DEVICE(obj); + info->display =3D g_strdup(dev->id); + } } for (i =3D 0; vd->listener !=3D NULL && i < vd->listener->nsioc; i= ++) { info->server =3D qmp_query_server_entry( --=20 2.47.3