mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfixes: virtio-input, usb-dwc2, pixman.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABCgAGBQJfGw+DAAoJEEy22O7T6HE4+rAQAKCImsnexrEuSpIteMgpBDJd
 uxWy3RsHGHGozmJgxRTTSlGNIjy7iu2VKbwVs4MRp5nncGmZ7jzNRwD22+GwTJm4
 70DtH+iKQuZ+DoLFjO7KsOWioz82Ag4zue915z5eQ/TzX48su11/9ulRryHS4q78
 VMaE4z905PBi/G7OEsI1KqiyGKf3b5IppBbxkjkn7Ocn+pgyvBHCCoKi5fus4y8o
 xq4HlHDVPbzUy74dOorFJa0XyJtZjjQIsNuJ25F5QhSdw8VFOfWBBoiCs1Ok7jDs
 u71GlVd0zYB/XN1VS7KazoqZ2T8qSS4pj+dkRNqHyqT11gFTEEFS9/c/H+AQCnNX
 RePb5288wn7JEu4xQ7CyEnXMqZeIjXh6kFQiuYesAUqdn6p2JGqlXLNQN56hopzY
 B/Fjd6bPirrlERZjecuBLnwo3xiI3+bbzDXNXzO78P5H88z1efbRnoR4uM/NG2kB
 5mjH3xFuLAINhFfwGBc1opw/Xa+ZlCUXmIXexnrrMJmOXuennNzIRClOekLN8EKz
 2gmDgia0n9oirioe+zXp05Hq6/f3rDHRXooHBnLa3H0IciWt29ltK4Mcw3dNVTGh
 Xf+VGcuRuZ3OlP1WqnGexz0dvYQLkryj/OzUiyrewn9wTr/+rXmd+S3Y/14E+u5j
 LRnc2UFnNX7o48/X9rOB
 =l5jQ
 -----END PGP SIGNATURE-----

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

bugfixes: virtio-input, usb-dwc2, pixman.

# gpg: Signature made Fri 24 Jul 2020 17:42:43 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/fixes-20200724-pull-request:
  configure: Allow to build tools without pixman
  hw/input/virtio-input-hid.c: Don't undef CONFIG_CURSES
  hw: Only compile the usb-dwc2 controller if it is really needed

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2020-07-25 18:46:48 +01:00
commit b0ce3f021e
4 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -4065,7 +4065,7 @@ fi
##########################################
# pixman support probe
if test "$want_tools" = "no" && test "$softmmu" = "no"; then
if test "$softmmu" = "no"; then
pixman_cflags=
pixman_libs=
elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then

1
hw/arm/Kconfig
View File

@ -315,6 +315,7 @@ config RASPI
select FRAMEBUFFER
select PL011 # UART
select SDHCI
select USB_DWC2
config STM32F205_SOC
bool

1
hw/input/virtio-input-hid.c
View File

@ -12,7 +12,6 @@
#include "hw/qdev-properties.h"
#include "hw/virtio/virtio-input.h"
#undef CONFIG_CURSES
#include "ui/console.h"
#include "standard-headers/linux/input.h"

1
hw/usb/Kconfig
View File

@ -48,7 +48,6 @@ config USB_MUSB
config USB_DWC2
bool
default y
select USB
config TUSB6010