[PULL v2 00/25] Functional tests, Microblaze endianness & pc/q35 cleanups

Thomas Huth posted 25 patches 5 months ago
Only 0 patches received!
docs/about/deprecated.rst                        |  19 ++--
docs/about/removed-features.rst                  |   9 ++
include/hw/boards.h                              |   9 +-
include/hw/i386/pc.h                             |   7 --
include/hw/i386/x86.h                            |   5 --
include/hw/loader.h                              |   2 -
include/hw/nvram/fw_cfg.h                        |  10 ---
include/hw/virtio/virtio-pci.h                   |   8 --
hw/core/loader.c                                 |  14 ---
hw/core/machine.c                                |  18 ----
hw/i386/pc.c                                     |  42 ++-------
hw/i386/pc_piix.c                                |  26 ------
hw/i386/pc_q35.c                                 |  26 ------
hw/i386/x86.c                                    |   1 -
hw/microblaze/petalogix_ml605_mmu.c              |  15 +---
hw/microblaze/petalogix_s3adsp1800_mmu.c         |  41 +++++++--
hw/microblaze/xlnx-zynqmp-pmu.c                  |   7 +-
hw/net/e1000.c                                   |  95 +++++++++-----------
hw/net/vmxnet3.c                                 |  44 ++-------
hw/nvram/fw_cfg.c                                | 110 ++---------------------
hw/scsi/vmw_pvscsi.c                             |  67 +++-----------
hw/virtio/virtio-pci.c                           |  11 +--
system/vl.c                                      |   5 --
target/i386/machine.c                            |   5 +-
tests/qtest/test-x86-cpuid-compat.c              |  14 ---
tests/unit/test-util-sockets.c                   |   4 +
tests/functional/test_mem_addr_space.py          |  63 ++++++-------
tests/functional/test_microblaze_s3adsp1800.py   |  18 ++--
tests/functional/test_microblazeel_s3adsp1800.py |   6 +-
tests/functional/test_mips_malta.py              |   6 +-
tests/functional/test_sparc64_tuxrun.py          |   1 +
31 files changed, 197 insertions(+), 511 deletions(-)
[PULL v2 00/25] Functional tests, Microblaze endianness & pc/q35 cleanups
Posted by Thomas Huth 5 months ago
 Hi Stefan!

The following changes since commit 80db93b2b88f9b3ed8927ae7ac74ca30e643a83e:

  Merge tag 'pull-aspeed-20250526' of https://github.com/legoater/qemu into staging (2025-05-26 10:16:59 -0400)

are available in the Git repository at:

  https://gitlab.com/thuth/qemu.git tags/pull-request-2025-05-28v2

for you to fetch changes up to 51c214b7c27096e3516aedf6befd69dc6d75b4ac:

  tests/unit/test-util-sockets: fix mem-leak on error object (2025-05-28 22:16:26 +0200)

----------------------------------------------------------------
* Functional tests improvements
* Endianness improvements/clean-ups for the Microblaze machines
* Remove obsolete -2.4 and -2.5 i440fx and q35 machine types and related code

v2: Dropped the memlock test patches

----------------------------------------------------------------
Matheus Tavares Bernardino (1):
      tests/unit/test-util-sockets: fix mem-leak on error object

Philippe Mathieu-Daudé (17):
      hw/i386/pc: Remove deprecated pc-q35-2.4 and pc-i440fx-2.4 machines
      hw/i386/pc: Remove PCMachineClass::broken_reserved_end field
      hw/i386/pc: Remove pc_compat_2_4[] array
      hw/core/machine: Remove hw_compat_2_4[] array
      hw/net/e1000: Remove unused E1000_FLAG_MAC flag
      hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_MIGRATE_EXTRA definition
      hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_DISABLE_PCIE definition
      hw/i386/pc: Remove deprecated pc-q35-2.5 and pc-i440fx-2.5 machines
      hw/i386/x86: Remove X86MachineClass::save_tsc_khz field
      hw/nvram/fw_cfg: Remove legacy FW_CFG_ORDER_OVERRIDE
      hw/core/machine: Remove hw_compat_2_5[] array
      hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_OLD_PCI_CONFIGURATION definition
      hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_DISABLE_PCIE_BIT definition
      hw/scsi/vmw_pvscsi: Convert DeviceRealize -> InstanceInit
      hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS definition
      hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_DISABLE_PCIE definition
      hw/net/vmxnet3: Merge DeviceRealize in InstanceInit

Thomas Huth (7):
      tests/functional/test_sparc64_tuxrun: Explicitly set the 'sun4u' machine
      tests/functional/test_mips_malta: Re-enable the check for the PCI host bridge
      tests/functional/test_mem_addr_space: Use set_machine() to select the machine
      hw/microblaze: Add endianness property to the petalogix_s3adsp1800 machine
      tests/functional: Test both microblaze s3adsp1800 endianness variants
      hw/microblaze: Remove the big-endian variants of ml605 and xlnx-zynqmp-pmu
      docs: Deprecate the qemu-system-microblazeel binary

 docs/about/deprecated.rst                        |  19 ++--
 docs/about/removed-features.rst                  |   9 ++
 include/hw/boards.h                              |   9 +-
 include/hw/i386/pc.h                             |   7 --
 include/hw/i386/x86.h                            |   5 --
 include/hw/loader.h                              |   2 -
 include/hw/nvram/fw_cfg.h                        |  10 ---
 include/hw/virtio/virtio-pci.h                   |   8 --
 hw/core/loader.c                                 |  14 ---
 hw/core/machine.c                                |  18 ----
 hw/i386/pc.c                                     |  42 ++-------
 hw/i386/pc_piix.c                                |  26 ------
 hw/i386/pc_q35.c                                 |  26 ------
 hw/i386/x86.c                                    |   1 -
 hw/microblaze/petalogix_ml605_mmu.c              |  15 +---
 hw/microblaze/petalogix_s3adsp1800_mmu.c         |  41 +++++++--
 hw/microblaze/xlnx-zynqmp-pmu.c                  |   7 +-
 hw/net/e1000.c                                   |  95 +++++++++-----------
 hw/net/vmxnet3.c                                 |  44 ++-------
 hw/nvram/fw_cfg.c                                | 110 ++---------------------
 hw/scsi/vmw_pvscsi.c                             |  67 +++-----------
 hw/virtio/virtio-pci.c                           |  11 +--
 system/vl.c                                      |   5 --
 target/i386/machine.c                            |   5 +-
 tests/qtest/test-x86-cpuid-compat.c              |  14 ---
 tests/unit/test-util-sockets.c                   |   4 +
 tests/functional/test_mem_addr_space.py          |  63 ++++++-------
 tests/functional/test_microblaze_s3adsp1800.py   |  18 ++--
 tests/functional/test_microblazeel_s3adsp1800.py |   6 +-
 tests/functional/test_mips_malta.py              |   6 +-
 tests/functional/test_sparc64_tuxrun.py          |   1 +
 31 files changed, 197 insertions(+), 511 deletions(-)


Re: [PULL v2 00/25] Functional tests, Microblaze endianness & pc/q35 cleanups
Posted by Stefan Hajnoczi 5 months ago
On Wed, May 28, 2025 at 10:24:42PM +0200, Thomas Huth wrote:
>  Hi Stefan!
> 
> The following changes since commit 80db93b2b88f9b3ed8927ae7ac74ca30e643a83e:
> 
>   Merge tag 'pull-aspeed-20250526' of https://github.com/legoater/qemu into staging (2025-05-26 10:16:59 -0400)
> 
> are available in the Git repository at:
> 
>   https://gitlab.com/thuth/qemu.git tags/pull-request-2025-05-28v2
> 
> for you to fetch changes up to 51c214b7c27096e3516aedf6befd69dc6d75b4ac:
> 
>   tests/unit/test-util-sockets: fix mem-leak on error object (2025-05-28 22:16:26 +0200)
> 
> ----------------------------------------------------------------
> * Functional tests improvements
> * Endianness improvements/clean-ups for the Microblaze machines
> * Remove obsolete -2.4 and -2.5 i440fx and q35 machine types and related code
> 
> v2: Dropped the memlock test patches

Please take a look at the following CI failure:

ASAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1 QTEST_QEMU_BINARY=./qemu-system-microblaze QTEST_QEMU_IMG=./qemu-img UBSAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1 G_TEST_DBUS_DAEMON=/home/gitlab-runner/builds/E8PpwMky/0/qemu-project/qemu/tests/dbus-vmstate-daemon.sh MSAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1 RUST_BACKTRACE=1 QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon PYTHON=/home/gitlab-runner/builds/E8PpwMky/0/qemu-project/qemu/build/pyvenv/bin/python3 MALLOC_PERTURB_=57 MESON_TEST_ITERATION=1 /home/gitlab-runner/builds/E8PpwMky/0/qemu-project/qemu/build/tests/qtest/test-netfilter --tap -k
――――――――――――――――――――――――――――――――――――― ✀  ―――――――――――――――――――――――――――――――――――――
stderr:
munmap_chunk(): invalid pointer
../tests/qtest/libqtest.c:208: kill_qemu() detected QEMU death from signal 6 (Aborted) (core dumped)
(test program exited with status code -6)

More info here:
https://gitlab.com/qemu-project/qemu/-/jobs/10190886460#L5038

Thanks!

Stefan

> 
> ----------------------------------------------------------------
> Matheus Tavares Bernardino (1):
>       tests/unit/test-util-sockets: fix mem-leak on error object
> 
> Philippe Mathieu-Daudé (17):
>       hw/i386/pc: Remove deprecated pc-q35-2.4 and pc-i440fx-2.4 machines
>       hw/i386/pc: Remove PCMachineClass::broken_reserved_end field
>       hw/i386/pc: Remove pc_compat_2_4[] array
>       hw/core/machine: Remove hw_compat_2_4[] array
>       hw/net/e1000: Remove unused E1000_FLAG_MAC flag
>       hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_MIGRATE_EXTRA definition
>       hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_DISABLE_PCIE definition
>       hw/i386/pc: Remove deprecated pc-q35-2.5 and pc-i440fx-2.5 machines
>       hw/i386/x86: Remove X86MachineClass::save_tsc_khz field
>       hw/nvram/fw_cfg: Remove legacy FW_CFG_ORDER_OVERRIDE
>       hw/core/machine: Remove hw_compat_2_5[] array
>       hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_OLD_PCI_CONFIGURATION definition
>       hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_DISABLE_PCIE_BIT definition
>       hw/scsi/vmw_pvscsi: Convert DeviceRealize -> InstanceInit
>       hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS definition
>       hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_DISABLE_PCIE definition
>       hw/net/vmxnet3: Merge DeviceRealize in InstanceInit
> 
> Thomas Huth (7):
>       tests/functional/test_sparc64_tuxrun: Explicitly set the 'sun4u' machine
>       tests/functional/test_mips_malta: Re-enable the check for the PCI host bridge
>       tests/functional/test_mem_addr_space: Use set_machine() to select the machine
>       hw/microblaze: Add endianness property to the petalogix_s3adsp1800 machine
>       tests/functional: Test both microblaze s3adsp1800 endianness variants
>       hw/microblaze: Remove the big-endian variants of ml605 and xlnx-zynqmp-pmu
>       docs: Deprecate the qemu-system-microblazeel binary
> 
>  docs/about/deprecated.rst                        |  19 ++--
>  docs/about/removed-features.rst                  |   9 ++
>  include/hw/boards.h                              |   9 +-
>  include/hw/i386/pc.h                             |   7 --
>  include/hw/i386/x86.h                            |   5 --
>  include/hw/loader.h                              |   2 -
>  include/hw/nvram/fw_cfg.h                        |  10 ---
>  include/hw/virtio/virtio-pci.h                   |   8 --
>  hw/core/loader.c                                 |  14 ---
>  hw/core/machine.c                                |  18 ----
>  hw/i386/pc.c                                     |  42 ++-------
>  hw/i386/pc_piix.c                                |  26 ------
>  hw/i386/pc_q35.c                                 |  26 ------
>  hw/i386/x86.c                                    |   1 -
>  hw/microblaze/petalogix_ml605_mmu.c              |  15 +---
>  hw/microblaze/petalogix_s3adsp1800_mmu.c         |  41 +++++++--
>  hw/microblaze/xlnx-zynqmp-pmu.c                  |   7 +-
>  hw/net/e1000.c                                   |  95 +++++++++-----------
>  hw/net/vmxnet3.c                                 |  44 ++-------
>  hw/nvram/fw_cfg.c                                | 110 ++---------------------
>  hw/scsi/vmw_pvscsi.c                             |  67 +++-----------
>  hw/virtio/virtio-pci.c                           |  11 +--
>  system/vl.c                                      |   5 --
>  target/i386/machine.c                            |   5 +-
>  tests/qtest/test-x86-cpuid-compat.c              |  14 ---
>  tests/unit/test-util-sockets.c                   |   4 +
>  tests/functional/test_mem_addr_space.py          |  63 ++++++-------
>  tests/functional/test_microblaze_s3adsp1800.py   |  18 ++--
>  tests/functional/test_microblazeel_s3adsp1800.py |   6 +-
>  tests/functional/test_mips_malta.py              |   6 +-
>  tests/functional/test_sparc64_tuxrun.py          |   1 +
>  31 files changed, 197 insertions(+), 511 deletions(-)
> 
Re: [PULL v2 00/25] Functional tests, Microblaze endianness & pc/q35 cleanups
Posted by Thomas Huth 5 months ago
On 29/05/2025 17.26, Stefan Hajnoczi wrote:
> On Wed, May 28, 2025 at 10:24:42PM +0200, Thomas Huth wrote:
>>   Hi Stefan!
>>
>> The following changes since commit 80db93b2b88f9b3ed8927ae7ac74ca30e643a83e:
>>
>>    Merge tag 'pull-aspeed-20250526' of https://github.com/legoater/qemu into staging (2025-05-26 10:16:59 -0400)
>>
>> are available in the Git repository at:
>>
>>    https://gitlab.com/thuth/qemu.git tags/pull-request-2025-05-28v2
>>
>> for you to fetch changes up to 51c214b7c27096e3516aedf6befd69dc6d75b4ac:
>>
>>    tests/unit/test-util-sockets: fix mem-leak on error object (2025-05-28 22:16:26 +0200)
>>
>> ----------------------------------------------------------------
>> * Functional tests improvements
>> * Endianness improvements/clean-ups for the Microblaze machines
>> * Remove obsolete -2.4 and -2.5 i440fx and q35 machine types and related code
>>
>> v2: Dropped the memlock test patches
> 
> Please take a look at the following CI failure:
> 
> ASAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1 QTEST_QEMU_BINARY=./qemu-system-microblaze QTEST_QEMU_IMG=./qemu-img UBSAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1 G_TEST_DBUS_DAEMON=/home/gitlab-runner/builds/E8PpwMky/0/qemu-project/qemu/tests/dbus-vmstate-daemon.sh MSAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1 RUST_BACKTRACE=1 QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon PYTHON=/home/gitlab-runner/builds/E8PpwMky/0/qemu-project/qemu/build/pyvenv/bin/python3 MALLOC_PERTURB_=57 MESON_TEST_ITERATION=1 /home/gitlab-runner/builds/E8PpwMky/0/qemu-project/qemu/build/tests/qtest/test-netfilter --tap -k
> ――――――――――――――――――――――――――――――――――――― ✀  ―――――――――――――――――――――――――――――――――――――
> stderr:
> munmap_chunk(): invalid pointer
> ../tests/qtest/libqtest.c:208: kill_qemu() detected QEMU death from signal 6 (Aborted) (core dumped)
> (test program exited with status code -6)
> 
> More info here:
> https://gitlab.com/qemu-project/qemu/-/jobs/10190886460#L5038

Drat, I think I missed:

diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c 
b/hw/microblaze/petalogix_s3adsp1800_mmu.c
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -187,6 +187,7 @@ static const TypeInfo 
petalogix_s3adsp1800_machine_types[] = {
          .name           = TYPE_PETALOGIX_S3ADSP1800_MACHINE,
          .parent         = TYPE_MACHINE,
          .class_init     = petalogix_s3adsp1800_machine_class_init,
+        .instance_size  = sizeof(S3Adsp1800MachineState),
      },
  };

... I'll respin the PR with that fix included.

  Thomas