Commit 5704c36d authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/fixes-31-20181112-pull-request' into staging 



fixes for 3.1: mark bt as deprecated, bugfixes for pulse, gtk and edid.

# gpg: Signature made Mon 12 Nov 2018 15:14:58 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# 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/fixes-31-20181112-pull-request:
  ui/gtk: fix cursor in egl mode
  pulseaudio: process audio data in smaller chunks
  edid: silence a stringop-overflow warning
  bt: Mark the bluetooth subsystem as deprecated

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 435cc3e4 f1aba960

audio/paaudio.c

+2 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static void *qpa_thread_out (void *arg) 
            }

        }



        decr = to_mix = audio_MIN (pa->live, pa->g->conf.samples >> 2);

        decr = to_mix = audio_MIN(pa->live, pa->g->conf.samples >> 5);

        rpos = pa->rpos;



        if (audio_pt_unlock(&pa->pt, __func__)) {
@@ -319,7 +319,7 @@ static void *qpa_thread_in (void *arg) 
            }

        }



        incr = to_grab = audio_MIN (pa->dead, pa->g->conf.samples >> 2);

        incr = to_grab = audio_MIN(pa->dead, pa->g->conf.samples >> 5);

        wpos = pa->wpos;



        if (audio_pt_unlock(&pa->pt, __func__)) {

hw/display/edid-generate.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static void edid_desc_text(uint8_t *desc, uint8_t type, 
    if (len > 12) {

        len = 12;

    }

    strncpy((char *)(desc + 5), text, len);

    memcpy(desc + 5, text, len);

    desc[5 + len] = '\n';

}

qemu-deprecated.texi

+7 −0
Original line number Diff line number Diff line
@@ -128,6 +128,13 @@ The @option{[hub_id name]} parameter tuple of the 'hostfwd_add' and 
The ``ivshmem'' device type is replaced by either the ``ivshmem-plain''

or ``ivshmem-doorbell`` device types.



@subsection bluetooth (since 3.1)



The bluetooth subsystem is unmaintained since many years and likely bitrotten

quite a bit. It will be removed without replacement unless some users speaks

up at the @email{qemu-devel@@nongnu.org} mailing list with information about

their usecases.



@section System emulator machines



@subsection pc-0.10 and pc-0.11 (since 3.0)

qemu-options.hx

+4 −0
Original line number Diff line number Diff line
@@ -2772,6 +2772,10 @@ logic. The Transport Layer is decided by the machine type. Currently 
the machines @code{n800} and @code{n810} have one HCI and all other

machines have none.



Note: This option and the whole bluetooth subsystem is considered as deprecated.

If you still use it, please send a mail to @email{qemu-devel@@nongnu.org} where

you describe your usecase.



@anchor{bt-hcis}

The following three types are recognized:

ui/gtk-egl.c

+12 −5
Original line number Diff line number Diff line
@@ -68,8 +68,15 @@ void gd_egl_draw(VirtualConsole *vc) 
        return;

    }



    window = gtk_widget_get_window(vc->gfx.drawing_area);

    ww = gdk_window_get_width(window);

    wh = gdk_window_get_height(window);



    if (vc->gfx.scanout_mode) {

        gd_egl_scanout_flush(&vc->gfx.dcl, 0, 0, vc->gfx.w, vc->gfx.h);



        vc->gfx.scale_x = (double)ww / vc->gfx.w;

        vc->gfx.scale_y = (double)wh / vc->gfx.h;

    } else {

        if (!vc->gfx.ds) {

            return;
@@ -77,13 +84,13 @@ void gd_egl_draw(VirtualConsole *vc) 
        eglMakeCurrent(qemu_egl_display, vc->gfx.esurface,

                       vc->gfx.esurface, vc->gfx.ectx);



        window = gtk_widget_get_window(vc->gfx.drawing_area);

        ww = gdk_window_get_width(window);

        wh = gdk_window_get_height(window);

        surface_gl_setup_viewport(vc->gfx.gls, vc->gfx.ds, ww, wh);

        surface_gl_render_texture(vc->gfx.gls, vc->gfx.ds);



        eglSwapBuffers(qemu_egl_display, vc->gfx.esurface);



        vc->gfx.scale_x = (double)ww / surface_width(vc->gfx.ds);

        vc->gfx.scale_y = (double)wh / surface_height(vc->gfx.ds);

    }

}
@@ -232,8 +239,8 @@ void gd_egl_cursor_position(DisplayChangeListener *dcl, 
{

    VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl);



    vc->gfx.cursor_x = pos_x;

    vc->gfx.cursor_y = pos_y;

    vc->gfx.cursor_x = pos_x * vc->gfx.scale_x;

    vc->gfx.cursor_y = pos_y * vc->gfx.scale_y;

}



void gd_egl_release_dmabuf(DisplayChangeListener *dcl,