[PULL 00/10] Bluetooth removal, and qtest & misc patches

Thomas Huth posted 10 patches 4 years, 4 months ago
Test asan failed
Test checkpatch failed
Test FreeBSD failed
Test docker-mingw@fedora failed
Test docker-clang@ubuntu failed
Test docker-quick@centos7 failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20191212185424.4675-1-thuth@redhat.com
Maintainers: Fam Zheng <fam@euphon.net>, Peter Maydell <peter.maydell@linaro.org>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Michael Roth <mdroth@linux.vnet.ibm.com>, Juan Quintela <quintela@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, Laurent Vivier <lvivier@redhat.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, Stefan Weil <sw@weilnetz.de>, Thomas Huth <thuth@redhat.com>, Andrzej Zaborowski <balrogg@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>
There is a newer version of this series
.gitlab-ci.yml                             |    2 +-
Makefile.objs                              |    2 -
bt-host.c                                  |  198 ---
bt-vhci.c                                  |  167 --
configure                                  |   31 -
hw/Kconfig                                 |    1 -
hw/Makefile.objs                           |    1 -
hw/arm/nseries.c                           |   16 +-
hw/bt/Kconfig                              |    2 -
hw/bt/Makefile.objs                        |    3 -
hw/bt/core.c                               |  143 --
hw/bt/hci-csr.c                            |  512 -------
hw/bt/hci.c                                | 2263 ----------------------------
hw/bt/hid.c                                |  553 -------
hw/bt/l2cap.c                              | 1367 -----------------
hw/bt/sdp.c                                |  989 ------------
hw/misc/ivshmem.c                          |   35 -
hw/usb/Kconfig                             |    5 -
hw/usb/Makefile.objs                       |    1 -
hw/usb/dev-bluetooth.c                     |  581 -------
include/hw/bt.h                            | 2177 --------------------------
include/sysemu/bt.h                        |   20 -
include/sysemu/os-win32.h                  |    2 -
os-win32.c                                 |   22 -
qemu-deprecated.texi                       |    7 -
qemu-doc.texi                              |   17 -
qemu-options.hx                            |   79 -
tests/Makefile.include                     |    4 +-
tests/docker/dockerfiles/fedora.docker     |    1 -
tests/docker/dockerfiles/ubuntu.docker     |    1 -
tests/docker/dockerfiles/ubuntu1804.docker |    1 -
tests/ivshmem-test.c                       |    2 +-
tests/libqtest.c                           |    2 +-
tests/migration-test.c                     |    3 +-
tests/modules-test.c                       |    3 +-
tests/test-bitmap.c                        |    8 +-
tests/test-crypto-tlscredsx509.c           |    2 +-
tests/test-crypto-tlssession.c             |    2 +-
tests/test-io-channel-tls.c                |    2 +-
tests/test-qga.c                           |    4 +-
tests/test-vmstate.c                       |    2 +-
ui/sdl2.c                                  |    2 +-
vl.c                                       |  136 --
43 files changed, 26 insertions(+), 9345 deletions(-)
delete mode 100644 bt-host.c
delete mode 100644 bt-vhci.c
delete mode 100644 hw/bt/Kconfig
delete mode 100644 hw/bt/Makefile.objs
delete mode 100644 hw/bt/core.c
delete mode 100644 hw/bt/hci-csr.c
delete mode 100644 hw/bt/hci.c
delete mode 100644 hw/bt/hid.c
delete mode 100644 hw/bt/l2cap.c
delete mode 100644 hw/bt/sdp.c
delete mode 100644 hw/usb/dev-bluetooth.c
delete mode 100644 include/hw/bt.h
delete mode 100644 include/sysemu/bt.h
[PULL 00/10] Bluetooth removal, and qtest & misc patches
Posted by Thomas Huth 4 years, 4 months ago
 Hi,

the following changes since commit 52901abf94477b400cf88c1f70bb305e690ba2de:

  Update version for v4.2.0-rc5 release (2019-12-10 17:15:21 +0000)

are available in the Git repository at:

  https://gitlab.com/huth/qemu.git tags/pull-request-2019-12-12

for you to fetch changes up to e38f04c4db40a9219cc0c516a6c68b9ca0a783d0:

  tests: use g_test_rand_int (2019-12-12 08:16:24 +0100)

----------------------------------------------------------------
- Removal of the deprecated bluetooth code
- Some qtest and misc patches
----------------------------------------------------------------

Cole Robinson (1):
      tests: fix modules-test 'duplicate test case' error

Laurent Vivier (1):
      pseries: disable migration-test if /dev/kvm cannot be used

Marc-André Lureau (1):
      glib: use portable g_setenv()

Markus Armbruster (1):
      hw/misc/ivshmem: Bury dead legacy INTx code

Paolo Bonzini (1):
      tests: use g_test_rand_int

Thomas Huth (4):
      hw/arm/nseries: Replace the bluetooth chardev with a "null" chardev
      hw/usb: Remove the USB bluetooth dongle device
      Remove the core bluetooth code
      Remove libbluetooth / bluez from the CI tests

Wainer dos Santos Moschetta (1):
      tests/Makefile: Fix check-report.* targets shown in check-help

 .gitlab-ci.yml                             |    2 +-
 Makefile.objs                              |    2 -
 bt-host.c                                  |  198 ---
 bt-vhci.c                                  |  167 --
 configure                                  |   31 -
 hw/Kconfig                                 |    1 -
 hw/Makefile.objs                           |    1 -
 hw/arm/nseries.c                           |   16 +-
 hw/bt/Kconfig                              |    2 -
 hw/bt/Makefile.objs                        |    3 -
 hw/bt/core.c                               |  143 --
 hw/bt/hci-csr.c                            |  512 -------
 hw/bt/hci.c                                | 2263 ----------------------------
 hw/bt/hid.c                                |  553 -------
 hw/bt/l2cap.c                              | 1367 -----------------
 hw/bt/sdp.c                                |  989 ------------
 hw/misc/ivshmem.c                          |   35 -
 hw/usb/Kconfig                             |    5 -
 hw/usb/Makefile.objs                       |    1 -
 hw/usb/dev-bluetooth.c                     |  581 -------
 include/hw/bt.h                            | 2177 --------------------------
 include/sysemu/bt.h                        |   20 -
 include/sysemu/os-win32.h                  |    2 -
 os-win32.c                                 |   22 -
 qemu-deprecated.texi                       |    7 -
 qemu-doc.texi                              |   17 -
 qemu-options.hx                            |   79 -
 tests/Makefile.include                     |    4 +-
 tests/docker/dockerfiles/fedora.docker     |    1 -
 tests/docker/dockerfiles/ubuntu.docker     |    1 -
 tests/docker/dockerfiles/ubuntu1804.docker |    1 -
 tests/ivshmem-test.c                       |    2 +-
 tests/libqtest.c                           |    2 +-
 tests/migration-test.c                     |    3 +-
 tests/modules-test.c                       |    3 +-
 tests/test-bitmap.c                        |    8 +-
 tests/test-crypto-tlscredsx509.c           |    2 +-
 tests/test-crypto-tlssession.c             |    2 +-
 tests/test-io-channel-tls.c                |    2 +-
 tests/test-qga.c                           |    4 +-
 tests/test-vmstate.c                       |    2 +-
 ui/sdl2.c                                  |    2 +-
 vl.c                                       |  136 --
 43 files changed, 26 insertions(+), 9345 deletions(-)
 delete mode 100644 bt-host.c
 delete mode 100644 bt-vhci.c
 delete mode 100644 hw/bt/Kconfig
 delete mode 100644 hw/bt/Makefile.objs
 delete mode 100644 hw/bt/core.c
 delete mode 100644 hw/bt/hci-csr.c
 delete mode 100644 hw/bt/hci.c
 delete mode 100644 hw/bt/hid.c
 delete mode 100644 hw/bt/l2cap.c
 delete mode 100644 hw/bt/sdp.c
 delete mode 100644 hw/usb/dev-bluetooth.c
 delete mode 100644 include/hw/bt.h
 delete mode 100644 include/sysemu/bt.h


Re: [PULL 00/10] Bluetooth removal, and qtest & misc patches
Posted by Peter Maydell 4 years, 4 months ago
On Thu, 12 Dec 2019 at 18:54, Thomas Huth <thuth@redhat.com> wrote:
>
>  Hi,
>
> the following changes since commit 52901abf94477b400cf88c1f70bb305e690ba2de:
>
>   Update version for v4.2.0-rc5 release (2019-12-10 17:15:21 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/huth/qemu.git tags/pull-request-2019-12-12
>
> for you to fetch changes up to e38f04c4db40a9219cc0c516a6c68b9ca0a783d0:
>
>   tests: use g_test_rand_int (2019-12-12 08:16:24 +0100)
>
> ----------------------------------------------------------------
> - Removal of the deprecated bluetooth code
> - Some qtest and misc patches
> ----------------------------------------------------------------

Hi; this fails to build on some of my build hosts:

OSX:
[...]
  GEN     target/sparc/trace.c
  GEN     util/trace.c
  GEN     hw/core/trace.c
  CC      qga/main.o
  CC      qemu-nbd.o
  CC      qemu-img.o
make: *** No rule to make target `config-all-devices.mak', needed by
`aarch64-softmmu/all'.  Stop.
make: *** Waiting for unfinished jobs....

ppc64 linux:
  CC      chardev/char-mux.o
  CC      chardev/char-null.o
  CC      chardev/char-parallel.o
  CC      chardev/char-pipe.o
  CC      chardev/char-pty.o
  CC      chardev/char-ringbuf.o
  CC      chardev/char-serial.o
  CC      chardev/char-socket.o
  CC      chardev/char-stdio.o
make: *** No rule to make target `/home/pm215/qemu/hw/bt/Kconfig',
needed by `aarch64-softmmu/config-devices.mak'.  Stop.
make: *** Waiting for unfinished jobs....
  CC      chardev/char-udp.o
make: Leaving directory `/home/pm215/qemu/build/all'


windows crossbuilds:
  CC      chardev/char-serial.o
  CC      chardev/char-socket.o
  CC      chardev/char-stdio.o
  CC      chardev/char-udp.o
  CC      chardev/char-win.o
make: *** No rule to make target
'/home/petmay01/qemu-for-merges/hw/bt/Kconfig', needed by
'aarch64-softmmu/config-devices.mak'.  Stop.
make: *** Waiting for unfinished jobs....
  CC      chardev/char-win-stdio.o

It's possible this is a lurking bug in our makefiles
where it doesn't regenerate the config-devices dependencies
properly; I'm not sure and haven't investigated.

thanks
-- PMM

Re: [PULL 00/10] Bluetooth removal, and qtest & misc patches
Posted by Thomas Huth 4 years, 4 months ago
On 16/12/2019 11.27, Peter Maydell wrote:
> On Thu, 12 Dec 2019 at 18:54, Thomas Huth <thuth@redhat.com> wrote:
>>
>>  Hi,
>>
>> the following changes since commit 52901abf94477b400cf88c1f70bb305e690ba2de:
>>
>>   Update version for v4.2.0-rc5 release (2019-12-10 17:15:21 +0000)
>>
>> are available in the Git repository at:
>>
>>   https://gitlab.com/huth/qemu.git tags/pull-request-2019-12-12
>>
>> for you to fetch changes up to e38f04c4db40a9219cc0c516a6c68b9ca0a783d0:
>>
>>   tests: use g_test_rand_int (2019-12-12 08:16:24 +0100)
>>
>> ----------------------------------------------------------------
>> - Removal of the deprecated bluetooth code
>> - Some qtest and misc patches
>> ----------------------------------------------------------------
> 
> Hi; this fails to build on some of my build hosts:
> 
> OSX:
> [...]
>   GEN     target/sparc/trace.c
>   GEN     util/trace.c
>   GEN     hw/core/trace.c
>   CC      qga/main.o
>   CC      qemu-nbd.o
>   CC      qemu-img.o
> make: *** No rule to make target `config-all-devices.mak', needed by
> `aarch64-softmmu/all'.  Stop.
> make: *** Waiting for unfinished jobs....

I unfortunately can't reproduce the issue, but if you've got some spare
minutes, could you please check whether this patch helps:

diff --git a/Makefile b/Makefile
index b437a346d7..23aae1437b 100644
--- a/Makefile
+++ b/Makefile
@@ -365,7 +365,8 @@ ifeq ($(SUBDIR_DEVICES_MAK),)
 config-all-devices.mak: config-host.mak
        $(call quiet-command,echo '# no devices' > $@,"GEN","$@")
 else
-config-all-devices.mak: $(SUBDIR_DEVICES_MAK) config-host.mak
+config-all-devices.mak: $(SUBDIR_DEVICES_MAK) config-host.mak \
+                       $(SRC_PATH)/hw/Kconfig
        $(call quiet-command, sed -n \
              's|^\([^=]*\)=\(.*\)$$|\1:=$$(findstring y,$$(\1)\2)|p' \
              $(SUBDIR_DEVICES_MAK) | sort -u > $@, \

?

> ppc64 linux:
>   CC      chardev/char-mux.o
>   CC      chardev/char-null.o
>   CC      chardev/char-parallel.o
>   CC      chardev/char-pipe.o
>   CC      chardev/char-pty.o
>   CC      chardev/char-ringbuf.o
>   CC      chardev/char-serial.o
>   CC      chardev/char-socket.o
>   CC      chardev/char-stdio.o
> make: *** No rule to make target `/home/pm215/qemu/hw/bt/Kconfig',
> needed by `aarch64-softmmu/config-devices.mak'.  Stop.
> make: *** Waiting for unfinished jobs....
>   CC      chardev/char-udp.o
> make: Leaving directory `/home/pm215/qemu/build/all'
> 
> 
> windows crossbuilds:
>   CC      chardev/char-serial.o
>   CC      chardev/char-socket.o
>   CC      chardev/char-stdio.o
>   CC      chardev/char-udp.o
>   CC      chardev/char-win.o
> make: *** No rule to make target
> '/home/petmay01/qemu-for-merges/hw/bt/Kconfig', needed by
> 'aarch64-softmmu/config-devices.mak'.  Stop.
> make: *** Waiting for unfinished jobs....
>   CC      chardev/char-win-stdio.o

These ones are really surprising to me ... *-softmmu/config-devices.mak
should have a proper dependency on hw/Kconfig so they should get
properly rebuild as far as I can tell. Could you please check the
*-softmmu/config-devices.mak.d dependency files whether the dependency
on hw/Kconfig is really there? Hmm, maybe "make" also tries to check the
old dependency to hw/bt/Kconfig first, before regenerating the files ...
not sure how to fix this properly, maybe leave an empty hw/bt/Kconfig
around for a while 'til all build systems have regenerated the
dependency files?

 Thomas


Re: [PULL 00/10] Bluetooth removal, and qtest & misc patches
Posted by Paolo Bonzini 4 years, 4 months ago
On 16/12/19 13:08, Thomas Huth wrote:
>> windows crossbuilds:
>>   CC      chardev/char-serial.o
>>   CC      chardev/char-socket.o
>>   CC      chardev/char-stdio.o
>>   CC      chardev/char-udp.o
>>   CC      chardev/char-win.o
>> make: *** No rule to make target
>> '/home/petmay01/qemu-for-merges/hw/bt/Kconfig', needed by
>> 'aarch64-softmmu/config-devices.mak'.  Stop.
>> make: *** Waiting for unfinished jobs....
>>   CC      chardev/char-win-stdio.o
> These ones are really surprising to me ... *-softmmu/config-devices.mak
> should have a proper dependency on hw/Kconfig so they should get
> properly rebuild as far as I can tell. Could you please check the
> *-softmmu/config-devices.mak.d dependency files whether the dependency
> on hw/Kconfig is really there? Hmm, maybe "make" also tries to check the
> old dependency to hw/bt/Kconfig first, before regenerating the files ...
> not sure how to fix this properly, maybe leave an empty hw/bt/Kconfig
> around for a while 'til all build systems have regenerated the
> dependency files?

I think in the past we've had patches where you just had to force a
"make distclean".

Paolo