[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 4/4] vga: refactor vram_size clamping and roundin
From: |
Radim Krčmář |
Subject: |
[Qemu-devel] [PATCH v2 4/4] vga: refactor vram_size clamping and rounding |
Date: |
Tue, 17 Feb 2015 17:30:53 +0100 |
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čmář <address@hidden>
---
v2: kept rounding and clamping (was [v1 1/2])
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 13f34f950d5a..7e0c01dc57fa 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -2095,6 +2095,17 @@ static const GraphicHwOps vga_ops = {
.text_update = vga_update_text,
};
+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;
@@ -2122,13 +2133,10 @@ void vga_common_init(VGACommonState *s, Object *obj,
bool global_vmstate)
expand4to8[i] = v;
}
- /* valid range: 1 MB -> 512 MB */
- s->vram_size = 1024 * 1024;
- while (s->vram_size < (s->vram_size_mb << 20) &&
- s->vram_size < (512 << 20)) {
- s->vram_size <<= 1;
- }
- s->vram_size_mb = s->vram_size >> 20;
+ s->vram_size_mb = uint_clamp(s->vram_size_mb, 1, 512);
+ s->vram_size_mb = pow2ceil(s->vram_size_mb);
+ s->vram_size = s->vram_size_mb << 20;
+
if (!s->vbe_size) {
s->vbe_size = s->vram_size;
}
--
2.3.0