Commit d9c7737e authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9c74a853 05fa1c74

hw/display/cirrus_vga.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

        }

    }

hw/display/qxl.c

+2 −0
Original line number Diff line number Diff line
@@ -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);