mirror of https://github.com/xemu-project/xemu.git
fixes for 3.1: mark bt as deprecated, bugfixes for pulse, gtk and edid.
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJb6ZjyAAoJEEy22O7T6HE4A6YQANWCqidXOjJ2ipL0zKex8pV3 YcYZ8crAU/kfOjt5fjYESYzvnjntYQGfPZ3ndI5rk/hXK5N7KX89Hfc50QkVH+Oh YFHYXYDqYyI728S1xqbqnbXbq8PKMonhtMO/ZFiOSXZ2qc2uIhRfIJ9IFdM6dWqI UMrjr+aeQ4wrfmdU5W+ayd7DniLLszvVToJCXvlL53n0riRk4sZMfyERZWxgWa5a SVd/xdLPKofUbEgpQrT9E9U4iCWUJ8LurXbtQdk9m6APITwdRFlfG7iIohC687pj tpI4oWEpDwZc3lw+Ndv//4MbPi6qLsZ7FWt4KNbrDwbX2LQL6J//+HBOw1N43ylb VP3CL/Kv6WxOPNDKrMsts2SMtv1Y/rvUOJ0m/KBRv5mnp/zRaTvPy8DJlTquOLtF Fim/iUz9Nps49MQqNviZl3ezUDYxSeXNejbv4VnxYBK78ObGJAKF4YmoQiGIPSaa NRhaoqFk+PDCgmqm1r5vrQe/ulUCgvH3OOivmY9XuO1BuJXRP+TildRi8Zc5SyDc rQ+N0vyCCm0Equ943MOkDv1zlwpUA2/6DeHsmfcLeJWLCkJQRR2/084WuVvEYtyx xnArAvmCGUsvIblMLVvDHgNjNP6QDdvBydLT8hYy8dCEP2Cpprl5MvzC9DwILP2T AedLIZE/KTTkYKRXJpih =vSVe -----END PGP SIGNATURE----- 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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
5704c36d25
|
@ -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;
|
rpos = pa->rpos;
|
||||||
|
|
||||||
if (audio_pt_unlock(&pa->pt, __func__)) {
|
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;
|
wpos = pa->wpos;
|
||||||
|
|
||||||
if (audio_pt_unlock(&pa->pt, __func__)) {
|
if (audio_pt_unlock(&pa->pt, __func__)) {
|
||||||
|
|
|
@ -165,7 +165,7 @@ static void edid_desc_text(uint8_t *desc, uint8_t type,
|
||||||
if (len > 12) {
|
if (len > 12) {
|
||||||
len = 12;
|
len = 12;
|
||||||
}
|
}
|
||||||
strncpy((char *)(desc + 5), text, len);
|
memcpy(desc + 5, text, len);
|
||||||
desc[5 + len] = '\n';
|
desc[5 + len] = '\n';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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''
|
The ``ivshmem'' device type is replaced by either the ``ivshmem-plain''
|
||||||
or ``ivshmem-doorbell`` device types.
|
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
|
@section System emulator machines
|
||||||
|
|
||||||
@subsection pc-0.10 and pc-0.11 (since 3.0)
|
@subsection pc-0.10 and pc-0.11 (since 3.0)
|
||||||
|
|
|
@ -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
|
the machines @code{n800} and @code{n810} have one HCI and all other
|
||||||
machines have none.
|
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}
|
@anchor{bt-hcis}
|
||||||
The following three types are recognized:
|
The following three types are recognized:
|
||||||
|
|
||||||
|
|
17
ui/gtk-egl.c
17
ui/gtk-egl.c
|
@ -68,8 +68,15 @@ void gd_egl_draw(VirtualConsole *vc)
|
||||||
return;
|
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) {
|
if (vc->gfx.scanout_mode) {
|
||||||
gd_egl_scanout_flush(&vc->gfx.dcl, 0, 0, vc->gfx.w, vc->gfx.h);
|
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 {
|
} else {
|
||||||
if (!vc->gfx.ds) {
|
if (!vc->gfx.ds) {
|
||||||
return;
|
return;
|
||||||
|
@ -77,13 +84,13 @@ void gd_egl_draw(VirtualConsole *vc)
|
||||||
eglMakeCurrent(qemu_egl_display, vc->gfx.esurface,
|
eglMakeCurrent(qemu_egl_display, vc->gfx.esurface,
|
||||||
vc->gfx.esurface, vc->gfx.ectx);
|
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_setup_viewport(vc->gfx.gls, vc->gfx.ds, ww, wh);
|
||||||
surface_gl_render_texture(vc->gfx.gls, vc->gfx.ds);
|
surface_gl_render_texture(vc->gfx.gls, vc->gfx.ds);
|
||||||
|
|
||||||
eglSwapBuffers(qemu_egl_display, vc->gfx.esurface);
|
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);
|
VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl);
|
||||||
|
|
||||||
vc->gfx.cursor_x = pos_x;
|
vc->gfx.cursor_x = pos_x * vc->gfx.scale_x;
|
||||||
vc->gfx.cursor_y = pos_y;
|
vc->gfx.cursor_y = pos_y * vc->gfx.scale_y;
|
||||||
}
|
}
|
||||||
|
|
||||||
void gd_egl_release_dmabuf(DisplayChangeListener *dcl,
|
void gd_egl_release_dmabuf(DisplayChangeListener *dcl,
|
||||||
|
|
4
vl.c
4
vl.c
|
@ -3269,6 +3269,10 @@ int main(int argc, char **argv, char **envp)
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
case QEMU_OPTION_bt:
|
case QEMU_OPTION_bt:
|
||||||
|
warn_report("The bluetooth subsystem is deprecated and will "
|
||||||
|
"be removed soon. If the bluetooth subsystem is "
|
||||||
|
"still useful for you, please send a mail to "
|
||||||
|
"qemu-devel@nongnu.org with your usecase.");
|
||||||
add_device_config(DEV_BT, optarg);
|
add_device_config(DEV_BT, optarg);
|
||||||
break;
|
break;
|
||||||
case QEMU_OPTION_audio_help:
|
case QEMU_OPTION_audio_help:
|
||||||
|
|
Loading…
Reference in New Issue