[PULL 00/20] Allow "make check" with "--without-default-devices"

Thomas Huth posted 20 patches 11 months, 2 weeks ago
Failed in applying to current master (apply log)
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, "Hervé Poussineau" <hpoussin@reactos.org>, David Hildenbrand <david@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, Magnus Damm <magnus.damm@gmail.com>, Artyom Tarasenko <atar4qemu@gmail.com>, Yanan Wang <wangyanan55@huawei.com>, Peter Xu <peterx@redhat.com>, Ani Sinha <anisinha@redhat.com>, Cleber Rosa <crosa@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, John Snow <jsnow@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>
include/hw/boards.h             |  1 +
include/hw/char/parallel.h      |  2 ++
include/hw/i386/pc.h            |  1 -
hw/char/parallel-isa.c          |  2 +-
hw/char/parallel.c              |  1 -
hw/i386/pc.c                    |  3 ++-
hw/i386/pc_piix.c               |  7 +++++--
hw/i386/pc_q35.c                |  8 ++++----
hw/isa/isa-superio.c            |  3 ++-
hw/ppc/e500.c                   |  3 ++-
hw/ppc/e500plat.c               |  1 +
hw/ppc/mac_newworld.c           |  4 +++-
hw/ppc/mac_oldworld.c           |  4 +++-
hw/ppc/mpc8544ds.c              |  1 +
hw/ppc/ppc440_bamboo.c          |  4 +++-
hw/ppc/prep.c                   |  4 +++-
hw/s390x/s390-virtio-ccw.c      |  4 +++-
hw/sh4/r2d.c                    |  4 +++-
hw/sparc64/sun4u.c              | 11 ++++++++---
softmmu/memory.c                |  4 +++-
softmmu/vl.c                    | 20 ++++++++++++++++++-
tests/qtest/cdrom-test.c        | 16 ++++++++++++---
tests/qtest/device-plug-test.c  |  9 ++++++++-
tests/qtest/readconfig-test.c   |  5 ++++-
tests/qtest/usb-hcd-uhci-test.c |  5 +++++
tests/qtest/virtio-ccw-test.c   | 43 +++++++++++++----------------------------
.gitlab-ci.d/buildtest.yml      |  2 +-
hw/i386/Kconfig                 |  2 +-
tests/avocado/acpi-bits.py      |  8 ++++----
tests/qemu-iotests/172          |  2 +-
tests/qtest/meson.build         | 12 ++++++------
31 files changed, 125 insertions(+), 71 deletions(-)
[PULL 00/20] Allow "make check" with "--without-default-devices"
Posted by Thomas Huth 11 months, 2 weeks ago
The following changes since commit aa222a8e4f975284b3f8f131653a4114b3d333b3:

  Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2023-05-19 12:17:16 -0700)

are available in the Git repository at:

  https://gitlab.com/thuth/qemu.git tags/pull-request-2023-05-22

for you to fetch changes up to 3884bf6468ac6bbb58c2b3feaa74e87f821b52f3:

  memory: stricter checks prior to unsetting engaged_in_io (2023-05-22 10:35:28 +0200)

----------------------------------------------------------------
* First batch of fixes to allow "make check" with "--without-default-devices"
* Enable the "bios bits" avocado test in the gitlab-CI
* Another minor fix for the redundancy DMA blocker code

----------------------------------------------------------------
Alexander Bulekov (1):
      memory: stricter checks prior to unsetting engaged_in_io

Ani Sinha (1):
      acpi/tests/avocado/bits: enable bios bits avocado tests on gitlab CI pipeline

Thomas Huth (18):
      hw/i386/Kconfig: ISAPC works fine without VGA_ISA
      softmmu/vl.c: Check for the availability of the VGA device before using it
      hw: Move the default NIC machine class setting from the x86 to the generic one
      softmmu/vl.c: Disable default NIC if it has not been compiled into the binary
      hw/ppc: Use MachineClass->default_nic in the ppc machines
      hw/s390x: Use MachineClass->default_nic in the s390x machine
      hw/sh4: Use MachineClass->default_nic in the sh4 r2d machine
      hw/char/parallel: Move TYPE_ISA_PARALLEL to the header file
      hw/i386: Ignore the default parallel port if it has not been compiled into QEMU
      hw/sparc64/sun4u: Use MachineClass->default_nic and MachineClass->no_parallel
      tests/qtest/readconfig-test: Check for the availability of USB controllers
      tests/qtest/usb-hcd-uhci-test: Skip test if UHCI controller is not available
      tests/qtest/cdrom-test: Fix the test to also work without optional devices
      tests/qtest/virtio-ccw-test: Remove superfluous tests
      tests/qtest: Check for the availability of virtio-ccw devices before using them
      tests/qtest/meson.build: Run the net filter tests only with default devices
      tests/qemu-iotests/172: Run QEMU with -vga none and -nic none
      .gitlab-ci.d/buildtest.yml: Run full "make check" with --without-default-devices

 include/hw/boards.h             |  1 +
 include/hw/char/parallel.h      |  2 ++
 include/hw/i386/pc.h            |  1 -
 hw/char/parallel-isa.c          |  2 +-
 hw/char/parallel.c              |  1 -
 hw/i386/pc.c                    |  3 ++-
 hw/i386/pc_piix.c               |  7 +++++--
 hw/i386/pc_q35.c                |  8 ++++----
 hw/isa/isa-superio.c            |  3 ++-
 hw/ppc/e500.c                   |  3 ++-
 hw/ppc/e500plat.c               |  1 +
 hw/ppc/mac_newworld.c           |  4 +++-
 hw/ppc/mac_oldworld.c           |  4 +++-
 hw/ppc/mpc8544ds.c              |  1 +
 hw/ppc/ppc440_bamboo.c          |  4 +++-
 hw/ppc/prep.c                   |  4 +++-
 hw/s390x/s390-virtio-ccw.c      |  4 +++-
 hw/sh4/r2d.c                    |  4 +++-
 hw/sparc64/sun4u.c              | 11 ++++++++---
 softmmu/memory.c                |  4 +++-
 softmmu/vl.c                    | 20 ++++++++++++++++++-
 tests/qtest/cdrom-test.c        | 16 ++++++++++++---
 tests/qtest/device-plug-test.c  |  9 ++++++++-
 tests/qtest/readconfig-test.c   |  5 ++++-
 tests/qtest/usb-hcd-uhci-test.c |  5 +++++
 tests/qtest/virtio-ccw-test.c   | 43 +++++++++++++----------------------------
 .gitlab-ci.d/buildtest.yml      |  2 +-
 hw/i386/Kconfig                 |  2 +-
 tests/avocado/acpi-bits.py      |  8 ++++----
 tests/qemu-iotests/172          |  2 +-
 tests/qtest/meson.build         | 12 ++++++------
 31 files changed, 125 insertions(+), 71 deletions(-)
Re: [PULL 00/20] Allow "make check" with "--without-default-devices"
Posted by Richard Henderson 11 months, 2 weeks ago
On 5/22/23 04:49, Thomas Huth wrote:
> The following changes since commit aa222a8e4f975284b3f8f131653a4114b3d333b3:
> 
>    Merge tag 'for_upstream' ofhttps://git.kernel.org/pub/scm/virt/kvm/mst/qemu  into staging (2023-05-19 12:17:16 -0700)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/thuth/qemu.git  tags/pull-request-2023-05-22
> 
> for you to fetch changes up to 3884bf6468ac6bbb58c2b3feaa74e87f821b52f3:
> 
>    memory: stricter checks prior to unsetting engaged_in_io (2023-05-22 10:35:28 +0200)
> 
> ----------------------------------------------------------------
> * First batch of fixes to allow "make check" with "--without-default-devices"
> * Enable the "bios bits" avocado test in the gitlab-CI
> * Another minor fix for the redundancy DMA blocker code
> 
> ----------------------------------------------------------------
> Alexander Bulekov (1):
>        memory: stricter checks prior to unsetting engaged_in_io
> 
> Ani Sinha (1):
>        acpi/tests/avocado/bits: enable bios bits avocado tests on gitlab CI pipeline
> 
> Thomas Huth (18):
>        hw/i386/Kconfig: ISAPC works fine without VGA_ISA
>        softmmu/vl.c: Check for the availability of the VGA device before using it
>        hw: Move the default NIC machine class setting from the x86 to the generic one
>        softmmu/vl.c: Disable default NIC if it has not been compiled into the binary
>        hw/ppc: Use MachineClass->default_nic in the ppc machines
>        hw/s390x: Use MachineClass->default_nic in the s390x machine
>        hw/sh4: Use MachineClass->default_nic in the sh4 r2d machine
>        hw/char/parallel: Move TYPE_ISA_PARALLEL to the header file
>        hw/i386: Ignore the default parallel port if it has not been compiled into QEMU
>        hw/sparc64/sun4u: Use MachineClass->default_nic and MachineClass->no_parallel
>        tests/qtest/readconfig-test: Check for the availability of USB controllers
>        tests/qtest/usb-hcd-uhci-test: Skip test if UHCI controller is not available
>        tests/qtest/cdrom-test: Fix the test to also work without optional devices
>        tests/qtest/virtio-ccw-test: Remove superfluous tests
>        tests/qtest: Check for the availability of virtio-ccw devices before using them
>        tests/qtest/meson.build: Run the net filter tests only with default devices
>        tests/qemu-iotests/172: Run QEMU with -vga none and -nic none
>        .gitlab-ci.d/buildtest.yml: Run full "make check" with --without-default-devices

Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/8.1 as appropriate.


r~