diff options
| author | Peter Maydell | 2016-03-01 11:34:19 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-03-01 11:34:19 +0100 |
| commit | d9c7737e57d1c5d8505d09b2803ca140875c9657 (patch) | |
| tree | 9aa2e149825bdd194cdf57b2ec625e1e456f0502 /hw/display/qxl.c | |
| parent | Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (diff) | |
| parent | qxl: lock current_async update in qxl_soft_reset (diff) | |
| download | qemu-d9c7737e57d1c5d8505d09b2803ca140875c9657.tar.gz qemu-d9c7737e57d1c5d8505d09b2803ca140875c9657.tar.xz qemu-d9c7737e57d1c5d8505d09b2803ca140875c9657.zip | |
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>
Diffstat (limited to 'hw/display/qxl.c')
| -rw-r--r-- | hw/display/qxl.c | 2 |
1 files changed, 2 insertions, 0 deletions
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); |