[PULL 0/3] Fixes 20200724 patches

[PULL 0/3] Fixes 20200724 patches

[Gerd Hoffmann]

The following changes since commit 09e0cd773723219d21655587954da2769f64ba01:

  Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-to-apply-20200722-1' into staging (2020-07-23 19:00:42 +0100)

are available in the Git repository at:

  git://git.kraxel.org/qemu tags/fixes-20200724-pull-request

for you to fetch changes up to 9b52b17ba5e96cec182537715e87308108b47117:

  configure: Allow to build tools without pixman (2020-07-24 17:36:03 +0200)

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

----------------------------------------------------------------

Peter Maydell (1):
  hw/input/virtio-input-hid.c: Don't undef CONFIG_CURSES

Thomas Huth (2):
  hw: Only compile the usb-dwc2 controller if it is really needed
  configure: Allow to build tools without pixman

 configure                   | 2 +-
 hw/input/virtio-input-hid.c | 1 -
 hw/arm/Kconfig              | 1 +
 hw/usb/Kconfig              | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

-- 
2.18.4

[PULL 1/3] hw: Only compile the usb-dwc2 controller if it is really needed

[Gerd Hoffmann]

From: Thomas Huth <thuth@redhat.com>

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 <thuth@redhat.com>
Reviewed-by: Paul Zimmerman <pauldzim@gmail.com>
Message-id: 20200722154719.10130-1-thuth@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 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 4a224a6351ab..bc3a423940b7 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 d4d8c37c2897..5e63dc75f815 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
-- 
2.18.4

[PULL 2/3] hw/input/virtio-input-hid.c: Don't undef CONFIG_CURSES

[Gerd Hoffmann]

From: Peter Maydell <peter.maydell@linaro.org>

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 <peter.maydell@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 20200723192457.28136-1-peter.maydell@linaro.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 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 09cf2609854f..a7a244a95dbb 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"
-- 
2.18.4

[PULL 3/3] configure: Allow to build tools without pixman

[Gerd Hoffmann]

From: Thomas Huth <thuth@redhat.com>

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 <thuth@redhat.com>
Message-id: 20200723141123.14765-1-thuth@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 4bd80ed507aa..2acc4d1465f8 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
-- 
2.18.4

Re: [PULL 0/3] Fixes 20200724 patches

[Peter Maydell]

On Fri, 24 Jul 2020 at 17:43, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit 09e0cd773723219d21655587954da2769f64ba01:
>
>   Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-to-apply-20200722-1' into staging (2020-07-23 19:00:42 +0100)
>
> are available in the Git repository at:
>
>   git://git.kraxel.org/qemu tags/fixes-20200724-pull-request
>
> for you to fetch changes up to 9b52b17ba5e96cec182537715e87308108b47117:
>
>   configure: Allow to build tools without pixman (2020-07-24 17:36:03 +0200)
>
> ----------------------------------------------------------------
> bugfixes: virtio-input, usb-dwc2, pixman.
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
for any user-visible changes.

-- PMM

Re: [PULL 3/3] configure: Allow to build tools without pixman

[Philippe Mathieu-Daudé]

Hi,

On 7/24/20 6:42 PM, Gerd Hoffmann wrote:
> From: Thomas Huth <thuth@redhat.com>
> 
> 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 <thuth@redhat.com>
> Message-id: 20200723141123.14765-1-thuth@redhat.com
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  configure | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index 4bd80ed507aa..2acc4d1465f8 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
> 

This commit broke my '--disable-system --disable-user --enable-tools' build:

$ make vhost-user-gpu
...
  LINK    vhost-user-gpu
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.o: in function
`vg_resource_create_2d':
contrib/vhost-user-gpu/vhost-user-gpu.c:322: undefined reference to
`pixman_image_create_bits'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.o: in function
`vg_resource_destroy':
contrib/vhost-user-gpu/vhost-user-gpu.c:381: undefined reference to
`pixman_image_unref'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.o: in function
`vg_transfer_to_host_2d':
contrib/vhost-user-gpu/vhost-user-gpu.c:538: undefined reference to
`pixman_image_get_format'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:540: undefined
reference to `pixman_image_get_stride'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:543: undefined
reference to `pixman_image_get_width'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:544: undefined
reference to `pixman_image_get_data'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:556: undefined
reference to `pixman_image_get_stride'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:557: undefined
reference to `pixman_image_get_height'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:555: undefined
reference to `pixman_image_get_data'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.o: in function
`vg_resource_flush':
contrib/vhost-user-gpu/vhost-user-gpu.c:693: undefined reference to
`pixman_region_init_rect'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:705: undefined
reference to `pixman_region_init'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:706: undefined
reference to `pixman_region_init_rect'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:709: undefined
reference to `pixman_region_intersect'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:711: undefined
reference to `pixman_region_extents'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:731: undefined
reference to `pixman_image_get_format'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:731: undefined
reference to `pixman_image_get_format'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:747: undefined
reference to `pixman_image_get_format'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:747: undefined
reference to `pixman_image_create_bits'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:753: undefined
reference to `pixman_image_composite'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:758: undefined
reference to `pixman_image_unref'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:762: undefined
reference to `pixman_region_fini'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:763: undefined
reference to `pixman_region_fini'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:765: undefined
reference to `pixman_region_fini'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.o: in function
`update_cursor_data_simple':
contrib/vhost-user-gpu/vhost-user-gpu.c:863: undefined reference to
`pixman_image_get_width'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:864: undefined
reference to `pixman_image_get_height'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:865: undefined
reference to `pixman_image_get_format'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:865: undefined
reference to `pixman_image_get_format'
/usr/bin/ld: contrib/vhost-user-gpu/vhost-user-gpu.c:868: undefined
reference to `pixman_image_get_data'
collect2: error: ld returned 1 exit status
make: *** [Makefile:730: vhost-user-gpu] Error 1

Thanks,

Phil.

Re: [PULL 3/3] configure: Allow to build tools without pixman

[Thomas Huth]

On 12/08/2020 18.26, Philippe Mathieu-Daudé wrote:
> Hi,
> 
> On 7/24/20 6:42 PM, Gerd Hoffmann wrote:
>> From: Thomas Huth <thuth@redhat.com>
>>
>> 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 <thuth@redhat.com>
>> Message-id: 20200723141123.14765-1-thuth@redhat.com
>> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>> ---
>>  configure | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/configure b/configure
>> index 4bd80ed507aa..2acc4d1465f8 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
>>
> 
> This commit broke my '--disable-system --disable-user --enable-tools' build:
> 
> $ make vhost-user-gpu

Yes, there is already a patch on the list to fix this. Look for:
"configure: Require pixman for vhost-user-gpu". I hope Gerd can pick it
up for his next pull request.

 Thomas

Re: [PULL 3/3] configure: Allow to build tools without pixman

[Philippe Mathieu-Daudé]

On 8/13/20 9:07 PM, Thomas Huth wrote:
> On 12/08/2020 18.26, Philippe Mathieu-Daudé wrote:
>> Hi,
>>
>> On 7/24/20 6:42 PM, Gerd Hoffmann wrote:
>>> From: Thomas Huth <thuth@redhat.com>
>>>
>>> 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 <thuth@redhat.com>
>>> Message-id: 20200723141123.14765-1-thuth@redhat.com
>>> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>>> ---
>>>  configure | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/configure b/configure
>>> index 4bd80ed507aa..2acc4d1465f8 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
>>>
>>
>> This commit broke my '--disable-system --disable-user --enable-tools' build:
>>
>> $ make vhost-user-gpu
> 
> Yes, there is already a patch on the list to fix this. Look for:
> "configure: Require pixman for vhost-user-gpu". I hope Gerd can pick it
> up for his next pull request.

Thanks! I'll test it. Too bad it misses the release :(

> 
>  Thomas
>