diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-20 10:05:45 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-20 10:05:45 +0000 |
| commit | bedf13ecab38bcd479e9db6994ebc3b2c5c7a3ae (patch) | |
| tree | 02d87a9095c7752bc9059ec0d7d51f7a6b41f903 /hw | |
| parent | ebedf0f9cd46b617df331eecc857c379d574ac62 (diff) | |
| parent | 7bc4f0846f5e15dad5a54490290241243b5a4416 (diff) | |
| download | qemu-bedf13ecab38bcd479e9db6994ebc3b2c5c7a3ae.zip qemu-bedf13ecab38bcd479e9db6994ebc3b2c5c7a3ae.tar.gz qemu-bedf13ecab38bcd479e9db6994ebc3b2c5c7a3ae.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-fixes-20170320-1' into staging
fixes for 2.9: vnc, cirrus, tcg display updates.
# gpg: Signature made Mon 20 Mar 2017 08:52:34 GMT
# gpg: using RSA key 0x4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/pull-fixes-20170320-1:
vnc: fix a qio-channel leak
cirrus: fix off-by-one in cirrus_bitblt_rop_bkwd_transp_*_16
ui/console: ensure graphic updates don't race with TCG vCPUs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/display/cirrus_vga_rop.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/cirrus_vga_rop.h b/hw/display/cirrus_vga_rop.h index c61a677..0841b9e 100644 --- a/hw/display/cirrus_vga_rop.h +++ b/hw/display/cirrus_vga_rop.h @@ -219,7 +219,7 @@ glue(glue(cirrus_bitblt_rop_bkwd_transp_, ROP_NAME),_16)(CirrusVGAState *s, srcpitch += bltwidth; for (y = 0; y < bltheight; y++) { for (x = 0; x < bltwidth; x+=2) { - ROP_OP_TR_16(s, dstaddr, cirrus_src16(s, srcaddr), transp); + ROP_OP_TR_16(s, dstaddr - 1, cirrus_src16(s, srcaddr - 1), transp); dstaddr -= 2; srcaddr -= 2; } |