From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTAKG-0008GN-2w for qemu-devel@nongnu.org; Wed, 04 Mar 2015 09:31:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YTAK5-00047t-Rw for qemu-devel@nongnu.org; Wed, 04 Mar 2015 09:31:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39271) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTAK5-000462-Ey for qemu-devel@nongnu.org; Wed, 04 Mar 2015 09:30:53 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t24EUqE1006261 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 4 Mar 2015 09:30:53 -0500 From: Gerd Hoffmann Date: Wed, 4 Mar 2015 15:30:46 +0100 Message-Id: <1425479449-11480-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1425479449-11480-1-git-send-email-kraxel@redhat.com> References: <1425479449-11480-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 4/7] vga: refactor vram_size clamping and rounding List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= From: Radim Kr=C4=8Dm=C3=A1=C5=99 Make the code a bit more obvious. We don't have min/max, so a general helper for clamp probably isn't acceptable either. Signed-off-by: Radim Kr=C4=8Dm=C3=A1=C5=99 Signed-off-by: Gerd Hoffmann --- hw/display/vga.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/hw/display/vga.c b/hw/display/vga.c index 6e4ca7e..c0f7b34 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -2094,6 +2094,17 @@ static const GraphicHwOps vga_ops =3D { .text_update =3D vga_update_text, }; =20 +static inline uint32_t uint_clamp(uint32_t val, uint32_t vmin, uint32_t = vmax) +{ + if (val < vmin) { + return vmin; + } + if (val > vmax) { + return vmax; + } + return val; +} + void vga_common_init(VGACommonState *s, Object *obj, bool global_vmstate= ) { int i, j, v, b; @@ -2121,13 +2132,10 @@ void vga_common_init(VGACommonState *s, Object *o= bj, bool global_vmstate) expand4to8[i] =3D v; } =20 - /* valid range: 1 MB -> 512 MB */ - s->vram_size =3D 1024 * 1024; - while (s->vram_size < (s->vram_size_mb << 20) && - s->vram_size < (512 << 20)) { - s->vram_size <<=3D 1; - } - s->vram_size_mb =3D s->vram_size >> 20; + s->vram_size_mb =3D uint_clamp(s->vram_size_mb, 1, 512); + s->vram_size_mb =3D pow2ceil(s->vram_size_mb); + s->vram_size =3D s->vram_size_mb << 20; + if (!s->vbe_size) { s->vbe_size =3D s->vram_size; } --=20 1.8.3.1