From nobody Thu Nov 28 09:51:42 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=1693829100; cv=none; d=zohomail.com; s=zohoarc; b=U0W9x//6YLui10TWbPz9YpzKV34ldOmmZ6p9h/O1lzsDKFIMHM3X6HDBbl5PuaIGp1zBydpBr6owxuXVIhiPVJA6DXMF3FLcueMFHVb60mppKkXUoV26RFuJL7T2sp4335SpNdALAALw1a2caoebLJFu/TuAPLYdXsk+Ktu34S8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693829100; 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=XUz5LIlrpmlm/3ukp2eWAxrg7lMtd/aX1XpFWZr4JgE=; b=fhkcc87fFbfACtw+y6h+JxvGW0YWcnE+USOzETIDTjjsYH0/Dvo3FdrpMycOuaPpx+2FUD9+IsWZHabqrJdZzbblG5BzkzlJ84HM61PINmB/HSTHD4alyTHlAIOcKIrj9IDak0YGtTCGEKMIxAamCEg4gXN8HQ6ZANONLF+m6zo= 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 169382910051450.018027568485195; Mon, 4 Sep 2023 05:05:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qd8B3-0007Co-1n; Mon, 04 Sep 2023 07:55:33 -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 1qd8Ah-0006tC-25 for qemu-devel@nongnu.org; Mon, 04 Sep 2023 07:55:12 -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 1qd8Ac-0000XY-T0 for qemu-devel@nongnu.org; Mon, 04 Sep 2023 07:55:08 -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-195-zJJwVuwON4a1xjvVhha8AQ-1; Mon, 04 Sep 2023 07:55:04 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4F252800C78 for ; Mon, 4 Sep 2023 11:55:04 +0000 (UTC) Received: from localhost (unknown [10.39.208.42]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FADC1121314; Mon, 4 Sep 2023 11:55:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693828506; 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=XUz5LIlrpmlm/3ukp2eWAxrg7lMtd/aX1XpFWZr4JgE=; b=XUgEXbch4Vyv+NY4/YacCbnnlcFGV8Y9SjT9glTCXyglE44XH+Vxtj1WBjzc5nmEOR3yA5 d3KGHjcZqSP0n6p9d5fyKJrmzLGWlCcul8+MU2q1hu9HtDkMxuEWMshN+oZBt6H0DHeZGJ ounIno7JrbzO+ScDisCrlFOuSx+H7AY= X-MC-Unique: zJJwVuwON4a1xjvVhha8AQ-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 33/52] ui/console: remove need for g_width/g_height Date: Mon, 4 Sep 2023 15:52:30 +0400 Message-ID: <20230904115251.4161397-34-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.3 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: 1693829102124100003 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-34-marcandre.lureau@redhat.com> --- ui/console.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ui/console.c b/ui/console.c index 70e11f924d..a3fd1c5059 100644 --- a/ui/console.c +++ b/ui/console.c @@ -2549,8 +2549,6 @@ static void vc_chr_open(Chardev *chr, QemuTextConsole *s; unsigned width =3D 0; unsigned height =3D 0; - int g_width =3D 80 * FONT_WIDTH; - int g_height =3D 24 * FONT_HEIGHT; =20 if (vc->has_width) { width =3D vc->width; @@ -2567,6 +2565,8 @@ static void vc_chr_open(Chardev *chr, trace_console_txt_new(width, height); if (width =3D=3D 0 || height =3D=3D 0) { s =3D QEMU_TEXT_CONSOLE(object_new(TYPE_QEMU_TEXT_CONSOLE)); + width =3D qemu_console_get_width(NULL, 80 * FONT_WIDTH); + 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; @@ -2577,9 +2577,7 @@ static void vc_chr_open(Chardev *chr, drv->console =3D s; =20 if (QEMU_CONSOLE(s)->scanout.kind !=3D SCANOUT_SURFACE) { - g_width =3D qemu_console_get_width(NULL, g_width); - g_height =3D qemu_console_get_height(NULL, g_height); - QEMU_CONSOLE(s)->surface =3D qemu_create_displaysurface(g_width, g= _height); + QEMU_CONSOLE(s)->surface =3D qemu_create_displaysurface(width, hei= ght); QEMU_CONSOLE(s)->scanout.kind =3D SCANOUT_SURFACE; } =20 --=20 2.41.0