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

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ebedf0f9 7bc4f084

hw/display/cirrus_vga_rop.h

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

        }

ui/console.c

+20 −1
Original line number Diff line number Diff line
@@ -1575,16 +1575,35 @@ bool dpy_gfx_check_format(QemuConsole *con, 
    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)

{

    DisplayChangeListener *dcl;



    QLIST_FOREACH(dcl, &s->listeners, next) {

        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);

            }

        }

    }

}



void dpy_text_cursor(QemuConsole *con, int x, int y)

{

ui/vnc.c

+1 −0
Original line number Diff line number Diff line
@@ -3677,6 +3677,7 @@ static int vnc_display_listen_addr(VncDisplay *vd, 
        qio_channel_set_name(QIO_CHANNEL(sioc), name);

        if (qio_channel_socket_listen_sync(

                sioc, rawaddrs[i], listenerr == NULL ? &listenerr : NULL) < 0) {

            object_unref(OBJECT(sioc));

            continue;

        }

        listening = true;