From nobody Thu Nov 28 11:02:30 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=1693829275; cv=none; d=zohomail.com; s=zohoarc; b=kgQstmkqLrZQ+51WFLQjCRZAqP2j3gJ9pgkXVanhxLp+1S/ByBwEJnM22scVtqhobyAqlZVJq/Ufrmct3ILcRuwbbvnC8GHHNAQ1mVIXJgeWch1LgQVpF5HG2oL7QObmhy5eqS2niHG6k3oDWl3cjTuYcx+Cq4YV1Ipe4FZWMnU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693829275; 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=2Ne/7j6le0wzOyvB/VuAUFxnOQk1uvQsIvzJaRXinX0=; b=PNVGfYBTOGs59mnNSi/J1l7IrU3ezUnHjTjkIKhMKqCgjqk3eqQkR4p5ApZI/eaJwWEa6aIVv/4CzcdzJ/ugiODgKoa2UNwQ2T+h18OIPEnWrXgNAOlGONjubhCRForcXJok5Jg5mz3G3h94y9w1yMJpL4K1cTuWxZq9ZB5gOvg= 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 1693829275483112.77763969607474; Mon, 4 Sep 2023 05:07:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qd8At-00072B-RX; Mon, 04 Sep 2023 07:55:27 -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 1qd8Ab-0006Ve-3h for qemu-devel@nongnu.org; Mon, 04 Sep 2023 07:55:07 -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 1qd8AY-0000MN-RE for qemu-devel@nongnu.org; Mon, 04 Sep 2023 07:55:04 -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-607-B7N-ndzVPC2aep4YgqlVXA-1; Mon, 04 Sep 2023 07:55:00 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5CDA9803F3A for ; Mon, 4 Sep 2023 11:55:00 +0000 (UTC) Received: from localhost (unknown [10.39.208.42]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5BD68400F5A; Mon, 4 Sep 2023 11:54:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693828502; 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=2Ne/7j6le0wzOyvB/VuAUFxnOQk1uvQsIvzJaRXinX0=; b=YTuvrqu8s8ndFXZ1MmakoDn8/ewgXahgDOnLd/9vyrm4WvyigZQmBmMUNT8q0M6kUfXIBU /KYVWwfn2gAUDzDvFTcth7tKwaU8fnwGEP09yZf2/hjAhJ4DM0UR6GLX+30sWrXVjdDhYa e6BWvVBQnjCyEsA56Q4hyd30TE4Rr9w= X-MC-Unique: B7N-ndzVPC2aep4YgqlVXA-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 32/52] ui/console: simplify getting active_console size Date: Mon, 4 Sep 2023 15:52:29 +0400 Message-ID: <20230904115251.4161397-33-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.10 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: 1693829276238100005 From: Marc-Andr=C3=A9 Lureau We can get the active console dimension regardless of its kind, by simply giving NULL as argument. It will fallback with the given value when the dimensions aren't known. This will also allow to move the code in a separate unit more easily. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20230830093843.3531473-33-marcandre.lureau@redhat.com> --- ui/console.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ui/console.c b/ui/console.c index 5d521ba79d..70e11f924d 100644 --- a/ui/console.c +++ b/ui/console.c @@ -2577,10 +2577,8 @@ static void vc_chr_open(Chardev *chr, drv->console =3D s; =20 if (QEMU_CONSOLE(s)->scanout.kind !=3D SCANOUT_SURFACE) { - if (active_console && active_console->scanout.kind =3D=3D SCANOUT_= SURFACE) { - g_width =3D qemu_console_get_width(active_console, g_width); - g_height =3D qemu_console_get_height(active_console, g_height); - } + 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)->scanout.kind =3D SCANOUT_SURFACE; } --=20 2.41.0