From nobody Mon Apr 29 16:32:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1512400837703631.3499643500386; Mon, 4 Dec 2017 07:20:37 -0800 (PST) Received: from localhost ([::1]:43673 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eLsXk-0001od-Gy for importer@patchew.org; Mon, 04 Dec 2017 10:20:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51464) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eLsUc-0007Om-7C for qemu-devel@nongnu.org; Mon, 04 Dec 2017 10:17:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eLsUX-0003Z7-SY for qemu-devel@nongnu.org; Mon, 04 Dec 2017 10:17:14 -0500 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:62349) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eLsUX-0003XI-Iw for qemu-devel@nongnu.org; Mon, 04 Dec 2017 10:17:09 -0500 Received: from unknown (HELO var.youpi.perso.aquilenet.fr) ([193.50.110.157]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/AES256-GCM-SHA384; 04 Dec 2017 16:17:07 +0100 Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.89) (envelope-from ) id 1eLsUV-0006mY-97; Mon, 04 Dec 2017 16:17:07 +0100 X-IronPort-AV: E=Sophos;i="5.45,359,1508796000"; d="scan'208";a="247133512" From: Samuel Thibault To: qemu-devel@nongnu.org Date: Mon, 4 Dec 2017 16:17:05 +0100 Message-Id: <20171204151705.26028-2-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171204151705.26028-1-samuel.thibault@ens-lyon.org> References: <20171204151705.26028-1-samuel.thibault@ens-lyon.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.134.164.104 Subject: [Qemu-devel] [PULL 1/1] baum: Truncate braille device size to 84x1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Thibault , peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Baum device bigger than 84 do not actually exist, some guest drivers would be upset by such sizes. Signed-off-by: Samuel Thibault --- chardev/baum.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/chardev/baum.c b/chardev/baum.c index 67fd783a59..78b0c87625 100644 --- a/chardev/baum.c +++ b/chardev/baum.c @@ -1,7 +1,7 @@ /* * QEMU Baum Braille Device * - * Copyright (c) 2008, 2010-2011, 2016 Samuel Thibault + * Copyright (c) 2008, 2010-2011, 2016-2017 Samuel Thibault * * Permission is hereby granted, free of charge, to any person obtaining a= copy * of this software and associated documentation files (the "Software"), t= o deal @@ -239,6 +239,12 @@ static int baum_deferred_init(BaumChardev *baum) brlapi_perror("baum: brlapi__getDisplaySize"); return 0; } + if (baum->y > 1) { + baum->y =3D 1; + } + if (baum->x > 84) { + baum->x =3D 84; + } =20 con =3D qemu_console_lookup_by_index(0); if (con && qemu_console_is_graphic(con)) { --=20 2.15.0