[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/7] vga: adjust dirty memory region if pel panning is active
From: |
Paolo Bonzini |
Subject: |
[PULL 3/7] vga: adjust dirty memory region if pel panning is active |
Date: |
Tue, 2 Apr 2024 15:16:45 +0200 |
When pel panning is active, one more byte is read from each of the VGA
memory planes. This has to be accounted in the computation of region_end,
otherwise vga_draw_graphic() fails an assertion:
qemu-system-i386: ../system/physmem.c:946:
cpu_physical_memory_snapshot_get_dirty: Assertion `start + length <= snap->end'
failed.
Reported-by: Helge Konetzka <hk@zapateado.de>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2244
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/display/vga.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/display/vga.c b/hw/display/vga.c
index b4ceff70eb8..40acd19e72a 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -1571,11 +1571,15 @@ static void vga_draw_graphic(VGACommonState *s, int
full_update)
break;
}
}
+ hpel = bits <= 8 ? s->params.hpel : 0;
region_start = (s->params.start_addr * 4);
region_end = region_start + (ram_addr_t)s->params.line_offset * height;
region_end += width * depth / 8; /* scanline length */
region_end -= s->params.line_offset;
+ if (hpel) {
+ region_end += 4;
+ }
if (region_end > s->vbe_size || depth == 0 || depth == 15) {
/*
* We land here on:
@@ -1660,7 +1664,6 @@ static void vga_draw_graphic(VGACommonState *s, int
full_update)
width, height, v, line_offset, s->cr[9], s->cr[VGA_CRTC_MODE],
s->params.line_compare, sr(s, VGA_SEQ_CLOCK_MODE));
#endif
- hpel = bits <= 8 ? s->params.hpel : 0;
addr1 = (s->params.start_addr * 4);
bwidth = DIV_ROUND_UP(width * bits, 8);
if (hpel) {
--
2.44.0
- [PULL 0/7] lsi, vga fixes for 2024-04-02, Paolo Bonzini, 2024/04/02
- [PULL 4/7] vga: do not treat horiz pel panning value of 8 as "enabled", Paolo Bonzini, 2024/04/02
- [PULL 5/7] lsi53c895a: avoid out of bounds access to s->msg[], Paolo Bonzini, 2024/04/02
- [PULL 1/7] vga: merge conditionals on shift control register, Paolo Bonzini, 2024/04/02
- [PULL 7/7] pc_q35: remove unnecessary m->alias assignment, Paolo Bonzini, 2024/04/02
- [PULL 6/7] lsi53c895a: detect invalid Block Move instruction, Paolo Bonzini, 2024/04/02
- [PULL 3/7] vga: adjust dirty memory region if pel panning is active,
Paolo Bonzini <=
- [PULL 2/7] vga: move computation of dirty memory region later, Paolo Bonzini, 2024/04/02
- Re: [PULL 0/7] lsi, vga fixes for 2024-04-02, Peter Maydell, 2024/04/02