From 8d942986be27bb40e6faca2032af763d7db57082 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Wed, 22 Jul 2020 17:47:19 +0200 Subject: [PATCH 1/3] hw: Only compile the usb-dwc2 controller if it is really needed The USB_DWC2 switch is currently "default y", so it is included in all qemu-system-* builds, even if it is not needed. Even worse, it does a "select USB", so USB devices are now showing up as available on targets that do not support USB at all. This sysbus device should only be included by the boards that need it, i.e. by the Raspi machines. Fixes: 153ef1662c ("dwc-hsotg (dwc2) USB host controller emulation") Signed-off-by: Thomas Huth Reviewed-by: Paul Zimmerman Message-id: 20200722154719.10130-1-thuth@redhat.com Signed-off-by: Gerd Hoffmann --- hw/arm/Kconfig | 1 + hw/usb/Kconfig | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 4a224a6351..bc3a423940 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -315,6 +315,7 @@ config RASPI select FRAMEBUFFER select PL011 # UART select SDHCI + select USB_DWC2 config STM32F205_SOC bool diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index d4d8c37c28..5e63dc75f8 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -48,7 +48,6 @@ config USB_MUSB config USB_DWC2 bool - default y select USB config TUSB6010 From 2c9728c0db8c02bf2f4f067548433af9f4102948 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Thu, 23 Jul 2020 20:24:57 +0100 Subject: [PATCH 2/3] hw/input/virtio-input-hid.c: Don't undef CONFIG_CURSES virtio-input-hid.c undefines CONFIG_CURSES before including ui/console.h. However since commits e2f82e924d057935 and b0766612d16da18 that header does not have behaviour dependent on CONFIG_CURSES. Remove the now-unneeded undef. Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth Acked-by: Michael S. Tsirkin Message-id: 20200723192457.28136-1-peter.maydell@linaro.org Signed-off-by: Gerd Hoffmann --- hw/input/virtio-input-hid.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c index 09cf260985..a7a244a95d 100644 --- a/hw/input/virtio-input-hid.c +++ b/hw/input/virtio-input-hid.c @@ -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" From 9b52b17ba5e96cec182537715e87308108b47117 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Thu, 23 Jul 2020 16:11:23 +0200 Subject: [PATCH 3/3] configure: Allow to build tools without pixman If pixman is not installed, it is currently not possible to run: .../configure --disable-system --enable-tools Seems like there was a dependency from one of the required source files to pixman in the past, but since commit 1ac0206b2ae1ffaeec56 ("qemu-timer.c: Trim list of included headers"), this dependency should be gone. Thus allow to compile the tools without pixman now. Signed-off-by: Thomas Huth Message-id: 20200723141123.14765-1-thuth@redhat.com Signed-off-by: Gerd Hoffmann --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 4bd80ed507..2acc4d1465 100755 --- a/configure +++ b/configure @@ -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