|
 |
976a86 |
From 6c17f6355cac0bc40bae876acf4d31e32978991f Mon Sep 17 00:00:00 2001
|
|
|
976a86 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
976a86 |
Date: Tue, 21 Mar 2017 09:58:04 +0100
|
|
|
976a86 |
Subject: [PATCH 4/7] cirrus: fix cirrus_invalidate_region
|
|
|
976a86 |
|
|
|
976a86 |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
976a86 |
Message-id: <1490090287-1503-5-git-send-email-kraxel@redhat.com>
|
|
|
976a86 |
Patchwork-id: 74423
|
|
|
976a86 |
O-Subject: [RHEL-7.4 qemu-kvm PATCH 4/7] cirrus: fix cirrus_invalidate_region
|
|
|
976a86 |
Bugzilla: 1430059
|
|
|
976a86 |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
976a86 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
976a86 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
976a86 |
|
|
|
976a86 |
off_cur_end is exclusive, so off_cur_end == cirrus_addr_mask is valid.
|
|
|
976a86 |
Fix calculation to make sure to allow that, otherwise the assert added
|
|
|
976a86 |
by commit f153b563f8cf121aebf5a2fff5f0110faf58ccb3 can trigger for valid
|
|
|
976a86 |
blits.
|
|
|
976a86 |
|
|
|
976a86 |
Test case: boot windows nt 4.0
|
|
|
976a86 |
|
|
|
976a86 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
976a86 |
Message-id: 1489579606-26020-1-git-send-email-kraxel@redhat.com
|
|
|
976a86 |
(cherry picked from commit e048dac616748273c2153490e9fdf1da242f0cad)
|
|
|
976a86 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
976a86 |
---
|
|
|
976a86 |
hw/display/cirrus_vga.c | 6 +++---
|
|
|
976a86 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
976a86 |
|
|
|
976a86 |
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
|
|
|
976a86 |
index 86b4c8b..aab6e02 100644
|
|
|
976a86 |
--- a/hw/display/cirrus_vga.c
|
|
|
976a86 |
+++ b/hw/display/cirrus_vga.c
|
|
|
976a86 |
@@ -661,11 +661,11 @@ static void cirrus_invalidate_region(CirrusVGAState * s, int off_begin,
|
|
|
976a86 |
}
|
|
|
976a86 |
|
|
|
976a86 |
for (y = 0; y < lines; y++) {
|
|
|
976a86 |
- off_cur = off_begin;
|
|
|
976a86 |
- off_cur_end = (off_cur + bytesperline) & s->cirrus_addr_mask;
|
|
|
976a86 |
+ off_cur = off_begin;
|
|
|
976a86 |
+ off_cur_end = ((off_cur + bytesperline - 1) & s->cirrus_addr_mask) + 1;
|
|
|
976a86 |
assert(off_cur_end >= off_cur);
|
|
|
976a86 |
memory_region_set_dirty(&s->vga.vram, off_cur, off_cur_end - off_cur);
|
|
|
976a86 |
- off_begin += off_pitch;
|
|
|
976a86 |
+ off_begin += off_pitch;
|
|
|
976a86 |
}
|
|
|
976a86 |
}
|
|
|
976a86 |
|
|
|
976a86 |
--
|
|
|
976a86 |
1.8.3.1
|
|
|
976a86 |
|