From nobody Thu Nov 28 10:48:11 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=1693829420; cv=none; d=zohomail.com; s=zohoarc; b=M5+ZH18+MmIjrQDrPfustOGm9nreuQtdscI4iljiPe1/uQerW1Z8uGADhP7RN+/ulpmlgcOfHMZgJq52pf63MwoXj87F0yFutltN0xEu7qdfU8u62Th1FG5+haRhA+nPOibn8Ox5ODvU4BuGOml0q7uUJRDFbWMP5xtV5ZTx5d0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693829420; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=b2rNjEp/JzIVt97SxAZIimLer1BY0QFgisrshHK2Peg=; b=Ve+LgMQBnl6UdX1vP8UjD5yXTCpbqINlrZOFQUfJAXchXa2nF23a3fIYCtxLSpmVpUUyhw0WBEhQtSkib0yzDO+ibhSfGmkm7pmm2DaoFoqtQnxrho0pGAIWOsxPIMA2hDleVGErycxF4xUd3PPsRc2n7FNUhqHMjnct+QUdQ/E= 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 1693829420240869.0239821694265; Mon, 4 Sep 2023 05:10:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qd8B8-0007hz-L8; Mon, 04 Sep 2023 07:55:38 -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 1qd8Ai-0006tp-UL for qemu-devel@nongnu.org; Mon, 04 Sep 2023 07:55:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qd8Ag-0000YH-RJ for qemu-devel@nongnu.org; Mon, 04 Sep 2023 07:55:12 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-311-n28heJ7API2nCMLXz0yP_w-1; Mon, 04 Sep 2023 07:55:07 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6AA0F3810D2B for ; Mon, 4 Sep 2023 11:55:07 +0000 (UTC) Received: from localhost (unknown [10.39.208.42]) by smtp.corp.redhat.com (Postfix) with ESMTP id A12B440C84A6; Mon, 4 Sep 2023 11:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693828509; 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: in-reply-to:in-reply-to:references:references; bh=b2rNjEp/JzIVt97SxAZIimLer1BY0QFgisrshHK2Peg=; b=CjXKEcsVWStr/+1ZKvVnKshdvqviGqz3lfY3pnIXTJF9dv0RcuQhP7i/feIPfqAbIKsoCH aigANfuW/prZCbZTiG+5CV8vYs8Yyxa1q+ffRJtfKpJ3ponWU181SHyoDlKauJKRpPLVPd V1RmWYGA2PdK3JjtNUCmUlwOBO2KD30= X-MC-Unique: n28heJ7API2nCMLXz0yP_w-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann Subject: [PULL 34/52] ui/vc: use common text console surface creation Date: Mon, 4 Sep 2023 15:52:31 +0400 Message-ID: <20230904115251.4161397-35-marcandre.lureau@redhat.com> In-Reply-To: <20230904115251.4161397-1-marcandre.lureau@redhat.com> References: <20230904115251.4161397-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.1 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.129.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_H4=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: 1693829421408100004 From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20230830093843.3531473-35-marcandre.lureau@redhat.com> --- ui/console.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ui/console.c b/ui/console.c index a3fd1c5059..3d884956b7 100644 --- a/ui/console.c +++ b/ui/console.c @@ -2569,18 +2569,13 @@ static void vc_chr_open(Chardev *chr, height =3D qemu_console_get_height(NULL, 24 * FONT_HEIGHT); } else { s =3D QEMU_TEXT_CONSOLE(object_new(TYPE_QEMU_FIXED_TEXT_CONSOLE)); - QEMU_CONSOLE(s)->scanout.kind =3D SCANOUT_SURFACE; - QEMU_CONSOLE(s)->surface =3D qemu_create_displaysurface(width, hei= ght); } =20 + dpy_gfx_replace_surface(QEMU_CONSOLE(s), qemu_create_displaysurface(wi= dth, height)); + s->chr =3D chr; drv->console =3D s; =20 - if (QEMU_CONSOLE(s)->scanout.kind !=3D SCANOUT_SURFACE) { - QEMU_CONSOLE(s)->surface =3D qemu_create_displaysurface(width, hei= ght); - QEMU_CONSOLE(s)->scanout.kind =3D SCANOUT_SURFACE; - } - /* set current text attributes to default */ drv->t_attrib =3D TEXT_ATTRIBUTES_DEFAULT; text_console_resize(s); --=20 2.41.0