diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2017-03-15 13:06:46 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2017-03-16 08:58:15 +0100 |
| commit | e048dac616748273c2153490e9fdf1da242f0cad (patch) | |
| tree | aae416e4bba1a7d5df989beb8d556287421aa5ca /hw | |
| parent | 827bd5172641f2a360ff9a3bad57bcf82e7f03f0 (diff) | |
| download | qemu-e048dac616748273c2153490e9fdf1da242f0cad.zip qemu-e048dac616748273c2153490e9fdf1da242f0cad.tar.gz qemu-e048dac616748273c2153490e9fdf1da242f0cad.tar.bz2 | |
cirrus: fix cirrus_invalidate_region
off_cur_end is exclusive, so off_cur_end == cirrus_addr_mask is valid.
Fix calculation to make sure to allow that, otherwise the assert added
by commit f153b563f8cf121aebf5a2fff5f0110faf58ccb3 can trigger for valid
blits.
Test case: boot windows nt 4.0
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 1489579606-26020-1-git-send-email-kraxel@redhat.com
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/display/cirrus_vga.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 326d511..a9f6d5b 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -667,11 +667,11 @@ static void cirrus_invalidate_region(CirrusVGAState * s, int off_begin, } for (y = 0; y < lines; y++) { - off_cur = off_begin; - off_cur_end = (off_cur + bytesperline) & s->cirrus_addr_mask; + off_cur = off_begin; + off_cur_end = ((off_cur + bytesperline - 1) & s->cirrus_addr_mask) + 1; assert(off_cur_end >= off_cur); memory_region_set_dirty(&s->vga.vram, off_cur, off_cur_end - off_cur); - off_begin += off_pitch; + off_begin += off_pitch; } } |