[Qemu-commits] [qemu/qemu] 3fbb78: scripts/checkpatch.pl: Ignore ObjC #import lines f...

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 3fbb78cfdc37910bebd6e146d14145da65dda9bb
      
https://github.com/qemu/qemu/commit/3fbb78cfdc37910bebd6e146d14145da65dda9bb
  Author: Phil Dennis-Jordan <phil@philjordan.eu>
  Date:   2024-11-08 (Fri, 08 Nov 2024)

  Changed paths:
    M scripts/checkpatch.pl

  Log Message:
  -----------
  scripts/checkpatch.pl: Ignore ObjC #import lines for operator spacing

checkpatch.pl lints for spaces around operators including / (slash).
Code lines starting with #include are ignored, as slashes in those
represent path separators.

In Objective-C code, #import is often used in preference to #include,
as preprocessor-based multiple-#include defenses are considered
non-idiomatic in that language.

This change extends checkpatch.pl to treat #import lines in the same
way as #include, avoiding false positives for "missing" spaces
around path separators on those lines.

Signed-off-by: Phil Dennis-Jordan <phil@philjordan.eu>
Message-ID: <20241024123555.25861-1-phil@philjordan.eu>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 6a564c8a183fb585d8fedf055b3566cb1f7a9b07
      
https://github.com/qemu/qemu/commit/6a564c8a183fb585d8fedf055b3566cb1f7a9b07
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-11-08 (Fri, 08 Nov 2024)

  Changed paths:
    M MAINTAINERS
    R tests/avocado/riscv_opensbi.py
    M tests/functional/meson.build
    A tests/functional/test_riscv_opensbi.py

  Log Message:
  -----------
  tests/functional: Convert the riscv_opensbi avocado test into a standalone 
test

The avocado test defined test functions for both, riscv32 and riscv64.
Since we can run the whole file with multiple targets in the new
framework, we can now consolidate the functions so we have to only
define one function per machine now.

Message-ID: <20240821082748.65853-23-thuth@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: feda2611b98ae962efbcacce9352636798213e5f
      
https://github.com/qemu/qemu/commit/feda2611b98ae962efbcacce9352636798213e5f
  Author: Cédric Le Goater <clg@redhat.com>
  Date:   2024-11-08 (Fri, 08 Nov 2024)

  Changed paths:
    M tests/functional/test_arm_aspeed.py

  Log Message:
  -----------
  test/functional: Fix Aspeed buildroot tests

Since commit 786bc2255256, cached asset files are read-only. Adjust
the QEMU command line for buildroot tests to reflect the new
constraint on the flash drive.

Fixes: f04cb2d00d5c ("tests/functional: Convert most Aspeed machine tests")
Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20241105132339.2967202-1-clg@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: dd6402b34fa71e7c576909afac6602eb32b5ed37
      
https://github.com/qemu/qemu/commit/dd6402b34fa71e7c576909afac6602eb32b5ed37
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-11-08 (Fri, 08 Nov 2024)

  Changed paths:
    M tests/functional/test_ppc64_hv.py
    M tests/functional/test_ppc_40p.py

  Log Message:
  -----------
  tests/functional: Fix the ppc64_hv and the ppc_40p test for read-only assets

Since commit 786bc2255256, cached asset files are read-only, so now we've
got to use "read-only=true" in tests that try to use these files directly.

Fixes: 786bc22552 ("tests/functional: make cached asset files read-only")
Message-ID: <20241105160926.393852-1-thuth@redhat.com>
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: bb986e406800c5bb4d746d2e636ea8fecf32cce8
      
https://github.com/qemu/qemu/commit/bb986e406800c5bb4d746d2e636ea8fecf32cce8
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-11-08 (Fri, 08 Nov 2024)

  Changed paths:
    M tests/functional/qemu_test/testcase.py

  Log Message:
  -----------
  tests/functional: Provide the user with hints where to find more log files

Since the base.log and console.log files are not referenced from the
meson test logs yet, they might be hard to find for the casual users.
Thus let's print some hints in case a test case failed. For this we
have to run unittest.main() with exit=False to get the results of the
testing. Then we can iterate through the failed test cases to print
out the information accordingly.

Message-ID: <20241105123849.359391-1-thuth@redhat.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Tested-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: f5ccd7e010eed410e4a296826e0c9427f28e50ae
      
https://github.com/qemu/qemu/commit/f5ccd7e010eed410e4a296826e0c9427f28e50ae
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-11-08 (Fri, 08 Nov 2024)

  Changed paths:
    M tests/functional/meson.build

  Log Message:
  -----------
  tests/functional: Bump timeouts of functional tests

When building QEMU with "--enable-debug" and running the tests
in parallel with "make -j$(nproc) check-functional", many tests are
still timing out due to our conservative timeout settings. Bump
the timeouts of the problematic tests and also increase the default
timeout to 90 seconds (from 60 seconds) to be on the safe side.

Message-ID: <20241106170946.990731-1-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 9acd38845416088d395a8aefb07b9c99d24ea784
      
https://github.com/qemu/qemu/commit/9acd38845416088d395a8aefb07b9c99d24ea784
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-11-08 (Fri, 08 Nov 2024)

  Changed paths:
    M MAINTAINERS
    M tests/functional/meson.build
    M tests/functional/test_aarch64_sbsaref.py
    A tests/functional/test_aarch64_sbsaref_alpine.py
    A tests/functional/test_aarch64_sbsaref_freebsd.py

  Log Message:
  -----------
  tests/functional: Split the test_aarch64_sbsaref test

The test_aarch64_sbsaref test is the test with the longest runtime
in our functional test suite. Split it into parts so that it can
be run on multiple CPUs in parallel.

For this we have to move the fetch_firmware() function out of the
class definition to be able to reuse it easily from the other tests
(deriving the Aarch64SbsarefAlpine and Aarch64SbsarefFreeBSD directly
from Aarch64SbsarefMachine does not work, unfortunately, since we'd
inherit the test_sbsaref_edk2_firmware() function that way, causing
it to be run multiple times - and keeping the fetch_firmware() in
a separate class without the test_sbsaref_edk2_firmware() function
also does not work since the "make precache-functional" won't work
in that case ==> turning fetch_firmware() into a static function is
the best option).

Message-ID: <20241106175029.1000589-1-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 7a383b993e63d5ddbda6630d98fae52879728c7f
      
https://github.com/qemu/qemu/commit/7a383b993e63d5ddbda6630d98fae52879728c7f
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   2024-11-08 (Fri, 08 Nov 2024)

  Changed paths:
    M .gitlab-ci.d/cirrus/freebsd-14.vars
    M tests/docker/dockerfiles/debian-amd64-cross.docker
    M tests/docker/dockerfiles/debian-arm64-cross.docker
    M tests/docker/dockerfiles/debian-armhf-cross.docker
    M tests/docker/dockerfiles/debian-i686-cross.docker
    M tests/docker/dockerfiles/debian-mips64el-cross.docker
    M tests/docker/dockerfiles/debian-mipsel-cross.docker
    M tests/docker/dockerfiles/debian-ppc64el-cross.docker
    M tests/docker/dockerfiles/debian-s390x-cross.docker
    M tests/docker/dockerfiles/fedora-win64-cross.docker
    M tests/lcitool/libvirt-ci
    M tests/lcitool/mappings.yml
    M tests/vm/generated/freebsd.json

  Log Message:
  -----------
  tests: refresh package lists with latest libvirt-ci

This updates the libvirt-ci  submodule to pull in various fixes,
the most notable reducing native package sets in cross builds.
Some packages were mistakenly marked as native, rather than
foreign, in libvirt-ci. Fixing this causes our dockerfiles to
pick up the cross arch package instead of native one, thus
improving our test coverage in a few areas.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20241106123525.511491-1-berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 44e21ef055c4a9beef8766ca9a2c3bd32da664f1
      
https://github.com/qemu/qemu/commit/44e21ef055c4a9beef8766ca9a2c3bd32da664f1
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2024-11-08 (Fri, 08 Nov 2024)

  Changed paths:
    M hw/m68k/next-kbd.c

  Log Message:
  -----------
  next-kbd: convert to use qemu_input_handler_register()

Convert the next-kbd device from the legacy UI qemu_add_kbd_event_handler()
function to use qemu_input_handler_register().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20241106120928.242443-2-mark.cave-ayland@ilande.co.uk>
[thuth: Removed the NEXTKBD_NO_KEY definition - replaced by 0 now]
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: e7e76150a2e9642adf6763bcd8ca9a2a5d3b74b3
      
https://github.com/qemu/qemu/commit/e7e76150a2e9642adf6763bcd8ca9a2a5d3b74b3
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2024-11-08 (Fri, 08 Nov 2024)

  Changed paths:
    M include/ui/console.h
    M ui/input-legacy.c

  Log Message:
  -----------
  ui/input-legacy.c: remove unused legacy qemu_add_kbd_event_handler() function

Since the last keyboard device has now been converted over to use
qemu_input_handler_register(), the legacy qemu_add_kbd_event_handler() function
is now unused and can be removed.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20241106120928.242443-3-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 134b443512825bed401b6e141447b8cdc22d2efe
      
https://github.com/qemu/qemu/commit/134b443512825bed401b6e141447b8cdc22d2efe
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-11-08 (Fri, 08 Nov 2024)

  Changed paths:
    M .gitlab-ci.d/cirrus/freebsd-14.vars
    M MAINTAINERS
    M hw/m68k/next-kbd.c
    M include/ui/console.h
    M scripts/checkpatch.pl
    R tests/avocado/riscv_opensbi.py
    M tests/docker/dockerfiles/debian-amd64-cross.docker
    M tests/docker/dockerfiles/debian-arm64-cross.docker
    M tests/docker/dockerfiles/debian-armhf-cross.docker
    M tests/docker/dockerfiles/debian-i686-cross.docker
    M tests/docker/dockerfiles/debian-mips64el-cross.docker
    M tests/docker/dockerfiles/debian-mipsel-cross.docker
    M tests/docker/dockerfiles/debian-ppc64el-cross.docker
    M tests/docker/dockerfiles/debian-s390x-cross.docker
    M tests/docker/dockerfiles/fedora-win64-cross.docker
    M tests/functional/meson.build
    M tests/functional/qemu_test/testcase.py
    M tests/functional/test_aarch64_sbsaref.py
    A tests/functional/test_aarch64_sbsaref_alpine.py
    A tests/functional/test_aarch64_sbsaref_freebsd.py
    M tests/functional/test_arm_aspeed.py
    M tests/functional/test_ppc64_hv.py
    M tests/functional/test_ppc_40p.py
    A tests/functional/test_riscv_opensbi.py
    M tests/lcitool/libvirt-ci
    M tests/lcitool/mappings.yml
    M tests/vm/generated/freebsd.json
    M ui/input-legacy.c

  Log Message:
  -----------
  Merge tag 'pull-request-2024-11-08' of https://gitlab.com/thuth/qemu into 
staging

* Various fixes and improvements for the functional tests
* Refresh CI container files with the latest changes from libvirt-ci
* Clean up keyboard code of the next-cube machine to get rid of a legacy API

# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmct48QRHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbUAzw//fOgAe+rNX10KIEWaHzTlw6EPRUHbKEo+
# yvy9mZ4CYiK3PfojuW6u9Mt32RIGFjLRUPC+ljZggjbxY2DUjzAUGx/kSwf0bzwE
# 8eRKRvd+l3ZFKklwDd7YQh+/O38P/uAq+T0AZQv/9h7rr0wPD6O+sVpKjVN4akuh
# 66Ekz974bDFaVJi8iIix0WCPCUFMZwWQqxaQrnoBH3wN8Ibc6Ermchs7aa1e6KNh
# DoX519JVNofXbugONNnqEjp43tbx/hzPZFyWf9tyX8ehp6+8po0zcZZwqdRkWhuv
# BkESKPz8rHuQOGMjm8rAnjmDEsbpJ+vOfn/ShdyAERv78mTNWwSvYVwq5zfpcTCt
# 9gpCNhhFzFLKlbDeIfgy9ky4R8Gzrww3icLzCsLlat6YCK547YkSr57BsYXJzLX4
# /NUYsaJ1RPdutwgNnmSzhBhObtUik3rFYH5aD0ETWZBdVY8ig5OqGpJ29P5zo860
# ROVFn4RX/XpmODOpYez4dwKVetR5SLHNG1aqduWKOwhAxPzLxK5OghjYkGf0bsel
# gA9t7A1TafgneYxJARKi7esD39xeUzhfzdzCOIOLXJga5kD2/bvZnQ4tkoLPl8QR
# iQEp1z758XmSFTYfzGUDA7SgIOzi9JG5dqtzcqJklr9wYurxwMYmqicJqA4ImoQt
# fZV/axe8Em0=
# =YRCB
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 08 Nov 2024 10:11:16 GMT
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* tag 'pull-request-2024-11-08' of https://gitlab.com/thuth/qemu:
  ui/input-legacy.c: remove unused legacy qemu_add_kbd_event_handler() function
  next-kbd: convert to use qemu_input_handler_register()
  tests: refresh package lists with latest libvirt-ci
  tests/functional: Split the test_aarch64_sbsaref test
  tests/functional: Bump timeouts of functional tests
  tests/functional: Provide the user with hints where to find more log files
  tests/functional: Fix the ppc64_hv and the ppc_40p test for read-only assets
  test/functional: Fix Aspeed buildroot tests
  tests/functional: Convert the riscv_opensbi avocado test into a standalone 
test
  scripts/checkpatch.pl: Ignore ObjC #import lines for operator spacing

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/96ed19c3bc4b...134b44351282

To unsubscribe from these emails, change your notification settings at 
https://github.com/qemu/qemu/settings/notifications