fixes for 2.9: vnc, cirrus, tcg display updates.
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJYz5hSAAoJEEy22O7T6HE41isP/0fM6wuwHppvPZf5wNf5ECmK sxcmgvQRUFjfrG1Al4ZXnfS9Q11Fg9zfMtpGDuyd47nD8P3u0CUWyv6OpZ7kU2D9 RB5rDWpbhoKTUF7GO1X+4GRpEj2b57NuW4dV3+CYtCqfD+o95LZYDSfkSF/p2tMd spxPab2G44OglQ8grnumErzaDhMwcTkI4SeP1ejf+TJmL25grJPXn6lTb083iYoO n8nvnIuAW3EKr/nNv7rnGR/YZ+hCS6EvTVknC9fDq9lLi/jzXU3mi2ljGkpSNIk0 DmsRYRJbpFMjsgw3/Y0mzWaGnna+o1lgf2sDeSirCK2J+MGlxAhNkBJMcuCTT7tG f+93jrUJLaT/Qm0JVDD0k0mOIkaELSYGS/jrS4WyVXeqRoi6RS+PwDdjblFsa/hq ExEteb1eBgiyx/tLXL+Y/rxEF4Az0BG5uaKrtCr6pkY061DVl3FS4S7gSg3oA4fE HpBFFOK3VloM9TWwPj4Uo2DWDBKpDj+lyCAnwu4kXP9kNoGsAv4qgBiIel/othb3 k8NjXG+VlDTXCqbu7Q5LqjaWyQC14y3C1w9bQyz9vp1FG4knoHx52ubQF6Gy6xPg oc/4S/ZJslty+4czDGQMdjw3nCwaDqWAPaXjm0n0dndybLUgad7w2Q4nj2Tbm4z7 j5oUux7ETA8/h8pFy0te =a6n8 -----END PGP SIGNATURE----- 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>
This commit is contained in:
commit
bedf13ecab
|
@ -219,7 +219,7 @@ glue(glue(cirrus_bitblt_rop_bkwd_transp_, ROP_NAME),_16)(CirrusVGAState *s,
|
||||||
srcpitch += bltwidth;
|
srcpitch += bltwidth;
|
||||||
for (y = 0; y < bltheight; y++) {
|
for (y = 0; y < bltheight; y++) {
|
||||||
for (x = 0; x < bltwidth; x+=2) {
|
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;
|
dstaddr -= 2;
|
||||||
srcaddr -= 2;
|
srcaddr -= 2;
|
||||||
}
|
}
|
||||||
|
|
19
ui/console.c
19
ui/console.c
|
@ -1575,16 +1575,35 @@ bool dpy_gfx_check_format(QemuConsole *con,
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Safe DPY refresh for TCG guests. This runs when the TCG vCPUs are
|
||||||
|
* quiescent so we can avoid races between dirty page tracking for
|
||||||
|
* direct frame-buffer access by the guest.
|
||||||
|
*
|
||||||
|
* This is a temporary stopgap until we've fixed the dirty tracking
|
||||||
|
* races in display adapters.
|
||||||
|
*/
|
||||||
|
static void do_safe_dpy_refresh(CPUState *cpu, run_on_cpu_data opaque)
|
||||||
|
{
|
||||||
|
DisplayChangeListener *dcl = opaque.host_ptr;
|
||||||
|
dcl->ops->dpy_refresh(dcl);
|
||||||
|
}
|
||||||
|
|
||||||
static void dpy_refresh(DisplayState *s)
|
static void dpy_refresh(DisplayState *s)
|
||||||
{
|
{
|
||||||
DisplayChangeListener *dcl;
|
DisplayChangeListener *dcl;
|
||||||
|
|
||||||
QLIST_FOREACH(dcl, &s->listeners, next) {
|
QLIST_FOREACH(dcl, &s->listeners, next) {
|
||||||
if (dcl->ops->dpy_refresh) {
|
if (dcl->ops->dpy_refresh) {
|
||||||
|
if (tcg_enabled()) {
|
||||||
|
async_safe_run_on_cpu(first_cpu, do_safe_dpy_refresh,
|
||||||
|
RUN_ON_CPU_HOST_PTR(dcl));
|
||||||
|
} else {
|
||||||
dcl->ops->dpy_refresh(dcl);
|
dcl->ops->dpy_refresh(dcl);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void dpy_text_cursor(QemuConsole *con, int x, int y)
|
void dpy_text_cursor(QemuConsole *con, int x, int y)
|
||||||
{
|
{
|
||||||
|
|
1
ui/vnc.c
1
ui/vnc.c
|
@ -3677,6 +3677,7 @@ static int vnc_display_listen_addr(VncDisplay *vd,
|
||||||
qio_channel_set_name(QIO_CHANNEL(sioc), name);
|
qio_channel_set_name(QIO_CHANNEL(sioc), name);
|
||||||
if (qio_channel_socket_listen_sync(
|
if (qio_channel_socket_listen_sync(
|
||||||
sioc, rawaddrs[i], listenerr == NULL ? &listenerr : NULL) < 0) {
|
sioc, rawaddrs[i], listenerr == NULL ? &listenerr : NULL) < 0) {
|
||||||
|
object_unref(OBJECT(sioc));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
listening = true;
|
listening = true;
|
||||||
|
|
Loading…
Reference in a new issue