Commit e048dac6 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

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 f153b563 can trigger for valid
blits.

Test case: boot windows nt 4.0

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Message-id: 1489579606-26020-1-git-send-email-kraxel@redhat.com
parent 827bd517

hw/display/cirrus_vga.c

+3 −3
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ 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_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;