diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-01 10:34:19 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-01 10:34:19 +0000 |
| commit | d9c7737e57d1c5d8505d09b2803ca140875c9657 (patch) | |
| tree | 9aa2e149825bdd194cdf57b2ec625e1e456f0502 | |
| parent | 9c74a853048f14fd9a3e2efa1e3a6935d00e7495 (diff) | |
| parent | 05fa1c742fd6f66978b989ded0dd981ef11c4a0c (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160301-1' into staging
vga: minor cirrus/qxl bugfixes.
# gpg: Signature made Tue 01 Mar 2016 07:16:22 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-vga-20160301-1:
qxl: lock current_async update in qxl_soft_reset
cirrus_vga: fix off-by-one in blit_region_is_unsafe
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/display/cirrus_vga.c | 4 | ||||
| -rw-r--r-- | hw/display/qxl.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index b6ce1c8bc7..57b91a77ca 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -276,14 +276,14 @@ static bool blit_region_is_unsafe(struct CirrusVGAState *s, + ((int64_t)s->cirrus_blt_height-1) * pitch; int32_t max = addr + s->cirrus_blt_width; - if (min < 0 || max >= s->vga.vram_size) { + if (min < 0 || max > s->vga.vram_size) { return true; } } else { int64_t max = addr + ((int64_t)s->cirrus_blt_height-1) * pitch + s->cirrus_blt_width; - if (max >= s->vga.vram_size) { + if (max > s->vga.vram_size) { return true; } } diff --git a/hw/display/qxl.c b/hw/display/qxl.c index a423deecea..919dc5cd36 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -1156,7 +1156,9 @@ static void qxl_soft_reset(PCIQXLDevice *d) trace_qxl_soft_reset(d->id); qxl_check_state(d); qxl_clear_guest_bug(d); + qemu_mutex_lock(&d->async_lock); d->current_async = QXL_UNDEFINED_IO; + qemu_mutex_unlock(&d->async_lock); if (d->id == 0) { qxl_enter_vga_mode(d); |