1. Patchew
  2. QEMU
  3. View series

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

Thomas Huth posted 27 patches 5 months ago
Failed in applying to current master (apply log)
Maintainers: Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Zhao Liu <zhao1.liu@intel.com>, "Michael S. Tsirkin" <mst@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Alistair Francis <alistair@alistair23.me>, Peter Maydell <peter.maydell@linaro.org>, Jason Wang <jasowang@redhat.com>, Dmitry Fleytman <dmitry.fleytman@gmail.com>, Gerd Hoffmann <kraxel@redhat.com>, Fam Zheng <fam@euphon.net>, Thomas Huth <thuth@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Aurelien Jarno <aurelien@aurel32.net>, "Alex Bennée" <alex.bennee@linaro.org>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Fabiano Rosas <farosas@suse.de>, Laurent Vivier <lvivier@redhat.com>
There is a newer version of this series
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/meson.build                     |   1 +
tests/functional/qemu_test/__init__.py           |   2 +-
tests/functional/qemu_test/decorators.py         |  18 ++++
tests/functional/test_mem_addr_space.py          |  63 ++++++-------
tests/functional/test_memlock.py                 |  79 ++++++++++++++++
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 +
35 files changed, 296 insertions(+), 512 deletions(-)
create mode 100755 tests/functional/test_memlock.py
[PULL 00/27] Functional tests, Microblaze endianness & pc/q35 cleanups
Posted by Thomas Huth 5 months ago 
 Hi!

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-28

for you to fetch changes up to 9c2da02e184fddfa7cd7d7813455c2306daae99a:

  tests/unit/test-util-sockets: fix mem-leak on error object (2025-05-28 11:59:47 +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

----------------------------------------------------------------
Alexandr Moshkov (2):
      tests/functional: add skipLockedMemoryTest decorator
      tests/functional: add memlock tests

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/meson.build                     |   1 +
 tests/functional/qemu_test/__init__.py           |   2 +-
 tests/functional/qemu_test/decorators.py         |  18 ++++
 tests/functional/test_mem_addr_space.py          |  63 ++++++-------
 tests/functional/test_memlock.py                 |  79 ++++++++++++++++
 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 +
 35 files changed, 296 insertions(+), 512 deletions(-)
 create mode 100755 tests/functional/test_memlock.py
Re: [PULL 00/27] Functional tests, Microblaze endianness & pc/q35 cleanups
Posted by Stefan Hajnoczi 5 months ago 
On Wed, May 28, 2025 at 6:12 AM Thomas Huth <thuth@redhat.com> wrote:
>
>  Hi!
>
> 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-28
>
> for you to fetch changes up to 9c2da02e184fddfa7cd7d7813455c2306daae99a:
>
>   tests/unit/test-util-sockets: fix mem-leak on error object (2025-05-28 11:59:47 +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
>
> ----------------------------------------------------------------
> Alexandr Moshkov (2):
>       tests/functional: add skipLockedMemoryTest decorator
>       tests/functional: add memlock tests

Hi Thomas and Alexandr,
The memlock tests are failing:
https://gitlab.com/qemu-project/qemu/-/jobs/10181084830#L5421
https://gitlab.com/qemu-project/qemu/-/jobs/10181084865#L5476

Please take a look and send a new pull request. 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/meson.build                     |   1 +
>  tests/functional/qemu_test/__init__.py           |   2 +-
>  tests/functional/qemu_test/decorators.py         |  18 ++++
>  tests/functional/test_mem_addr_space.py          |  63 ++++++-------
>  tests/functional/test_memlock.py                 |  79 ++++++++++++++++
>  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 +
>  35 files changed, 296 insertions(+), 512 deletions(-)
>  create mode 100755 tests/functional/test_memlock.py
>
>
Re: [PULL 00/27] Functional tests, Microblaze endianness & pc/q35 cleanups
Posted by Thomas Huth 5 months ago 
On 28/05/2025 21.23, Stefan Hajnoczi wrote:
> On Wed, May 28, 2025 at 6:12 AM Thomas Huth <thuth@redhat.com> wrote:
>>
>>   Hi!
>>
>> 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-28
>>
>> for you to fetch changes up to 9c2da02e184fddfa7cd7d7813455c2306daae99a:
>>
>>    tests/unit/test-util-sockets: fix mem-leak on error object (2025-05-28 11:59:47 +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
>>
>> ----------------------------------------------------------------
>> Alexandr Moshkov (2):
>>        tests/functional: add skipLockedMemoryTest decorator
>>        tests/functional: add memlock tests
> 
> Hi Thomas and Alexandr,
> The memlock tests are failing:
> https://gitlab.com/qemu-project/qemu/-/jobs/10181084830#L5421
> https://gitlab.com/qemu-project/qemu/-/jobs/10181084865#L5476
> 
> Please take a look and send a new pull request. Thanks!

According to the log:

  Output: qemu-system-aarch64: No machine specified, and there is no default

I think it likely does not make sense to run this test with the aarch64 
target... Alexandr, would it make sense to limit this to x86 only?

Also, quite a bunch of other tests failed at the same time in the aarch64 
job, too ... I wonder whether they were running out of memory now?

  Thomas
Re: [PULL 00/27] Functional tests, Microblaze endianness & pc/q35 cleanups
Posted by Alexandr Moshkov 4 months, 3 weeks ago 
On 5/29/25 01:12, Thomas Huth wrote:
> On 28/05/2025 21.23, Stefan Hajnoczi wrote:
>> On Wed, May 28, 2025 at 6:12 AM Thomas Huth <thuth@redhat.com> wrote:
>>>
>>>   Hi!
>>>
>>> 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-28
>>>
>>> for you to fetch changes up to 
>>> 9c2da02e184fddfa7cd7d7813455c2306daae99a:
>>>
>>>    tests/unit/test-util-sockets: fix mem-leak on error object 
>>> (2025-05-28 11:59:47 +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
>>>
>>> ----------------------------------------------------------------
>>> Alexandr Moshkov (2):
>>>        tests/functional: add skipLockedMemoryTest decorator
>>>        tests/functional: add memlock tests
>>
>> Hi Thomas and Alexandr,
>> The memlock tests are failing:
>> https://gitlab.com/qemu-project/qemu/-/jobs/10181084830#L5421
>> https://gitlab.com/qemu-project/qemu/-/jobs/10181084865#L5476
>>
>> Please take a look and send a new pull request. Thanks!
>
Hello! I think Stefan forgot to CC me in his reply. Only now find this 
message)


> According to the log:
>
>  Output: qemu-system-aarch64: No machine specified, and there is no 
> default
>
> I think it likely does not make sense to run this test with the 
> aarch64 target... Alexandr, would it make sense to limit this to x86 
> only?

It looks like adding this lines to vm creation fixes all problems with 
other targets on memlock test:

self.set_machine('none')
self.vm.add_args('-nodefaults')

What's the convenient way to fix it? Resend a new patch?


Best regards,

Alexandr

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.