From nobody Sun Sep 8 01:14:56 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=126.com ARC-Seal: i=1; a=rsa-sha256; t=1707407364; cv=none; d=zohomail.com; s=zohoarc; b=BTOGT3JgE9du3KEMeVOZT5BjC9xR7CvIc9Fcbitr+Tj3xLUx+Odojl8hwXcDgejSYQKNLRkDJN7IpnTI2WYLuKYqIuFMA5VtqT4N+ZFQ983r35ut+TwZ2WCawFpTt10poy6t83M+rkEupXH4yxSZrKv6o32URdpuEyZLR+YkyOM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707407364; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=sVHV6PYUwN23rSqvWgebqgUt2SID3QbNVQEPg+8em8A=; b=WW+6aulLK+RPnb6CXc8nHmMNIBdNbzhqp8+vmp4kDdumKk9vcaKbwl2jEBlwGh7Xku5A+8J6UE1GimLNlo+kss3hca9X2E7eyD7c3lckxBYRc2DzuRR0/eFKgjdERq+GzbeK7dpRwqVZT7hFTD3VqFNTnGVtp3Rd6EMupRUZnJY= 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 1707407364065466.3383717303973; Thu, 8 Feb 2024 07:49:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rY6dr-0000Oj-7K; Thu, 08 Feb 2024 10:48:47 -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 1rY6dm-0000OQ-V4; Thu, 08 Feb 2024 10:48:43 -0500 Received: from m16.mail.126.com ([220.197.31.6]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rY6dk-0005uV-KM; Thu, 08 Feb 2024 10:48:42 -0500 Received: from localhost.localdomain (unknown [183.192.131.113]) by gzga-smtp-mta-g1-3 (Coremail) with SMTP id _____wDnD4bH98RlvabfAQ--.0S2; Thu, 08 Feb 2024 23:48:26 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version: Content-Type; bh=sVHV6PYUwN23rSqvWgebqgUt2SID3QbNVQEPg+8em8A=; b=R3gz6aS62NiDoNt2oBXdj8jL5u6fctQ3GZAau7F6rV9v4uP7ZlkEZXoHi3iOJ/ +ik8OrmDcCJG63hL1G3sbU50EsOcPxb4u1JorQ7VovJq/M+Jccjvd8XSIVoF+DUL 6YbxgSEyl5LRKsva7vug/BDKOW+yXe2xMmatEJP0KjphA= From: Tianlan Zhou To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-stable , Tianlan Zhou Subject: [PATCH v2] ui/console: Fix console resize with placeholder surface Date: Thu, 8 Feb 2024 23:47:06 +0800 Message-Id: <20240208154705.1896-1-bobby825@126.com> X-Mailer: git-send-email 2.38.1.windows.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wDnD4bH98RlvabfAQ--.0S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Cw4kuF4DKrWrWF1DCrWruFg_yoW8Gr1xpF nxJF95Jrn8WryFvr9xtw4SgFWxu3909F4j9FWYkw17Zw1DJrWSv34xtw15u3yavw1ktas0 kFWUKFs8AF17Zw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zieMK_UUUUU= X-Originating-IP: [183.192.131.113] X-CM-SenderInfo: xereu5qysvqiyswou0bp/1tbiOg1+UmVEuzSHswAAsB 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=220.197.31.6; envelope-from=bobby825@126.com; helo=m16.mail.126.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @126.com) X-ZM-MESSAGEID: 1707407366161100003 In `qemu_console_resize()`, the old surface of the console is kept if the new console size is the same as the old one. If the old surface is a placeholder, and the new size of console is the same as the placeholder surface (640*480), it won't be replaced. In this situation, the surface's `QEMU_PLACEHOLDER_FLAG` flag is still set, so the console won't be displayed in SDL display mode. This patch fixes this problem by forcing a new surface if the old one is a placeholder. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Tianlan Zhou --- v2: - Slightly modify the commit message - Add Reviewed-by: Marc-Andr=C3=A9 Lureau v1: - Initial patch --- ui/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/console.c b/ui/console.c index 7db921e3b7..832055675c 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1577,7 +1577,7 @@ void qemu_console_resize(QemuConsole *s, int width, i= nt height) assert(QEMU_IS_GRAPHIC_CONSOLE(s)); =20 if ((s->scanout.kind !=3D SCANOUT_SURFACE || - (surface && surface->flags & QEMU_ALLOCATED_FLAG)) && + (surface && !is_buffer_shared(surface) && !is_placeholder(surface= ))) && qemu_console_get_width(s, -1) =3D=3D width && qemu_console_get_height(s, -1) =3D=3D height) { return; --=20 2.38.1.windows.1