[PULL 00/23] Misc single binary patches for 2025-10-29

Philippe Mathieu-Daudé posted 23 patches 2 weeks, 1 day ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20251029214001.99824-1-philmd@linaro.org
Maintainers: Pierrick Bouvier <pierrick.bouvier@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, "Cédric Le Goater" <clg@kaod.org>, Peter Maydell <peter.maydell@linaro.org>, Steven Lee <steven_lee@aspeedtech.com>, Troy Lee <leetroy@gmail.com>, Jamin Lin <jamin_lin@aspeedtech.com>, Andrew Jeffery <andrew@codeconstruct.com.au>, Joel Stanley <joel@jms.id.au>, Samuel Tardieu <sam@rfc1149.net>, Beniamino Galvani <b.galvani@gmail.com>, Strahinja Jankovic <strahinja.p.jankovic@gmail.com>, Antony Pavlov <antonynpavlov@gmail.com>, Igor Mitsyanko <i.mitsyanko@gmail.com>, Rob Herring <robh@kernel.org>, Jean-Christophe Dubois <jcd@tribudubois.net>, Bernhard Beschow <shentey@gmail.com>, Andrey Smirnov <andrew.smirnov@gmail.com>, Subbaraya Sundeep <sundeep.lkml@gmail.com>, Jan Kiszka <jan.kiszka@web.de>, Alistair Francis <alistair@alistair23.me>, Tyrone Ting <kfting@nuvoton.com>, Hao Wu <wuhaotsh@google.com>, Felipe Balbi <balbi@kernel.org>, Niek Linnenbank <nieklinnenbank@gmail.com>, Radoslaw Biernacki <rad@semihalf.com>, Leif Lindholm <leif.lindholm@oss.qualcomm.com>, Alexandre Iooss <erdnaxe@crans.org>, "Michael S. Tsirkin" <mst@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <anisinha@redhat.com>, Shannon Zhao <shannon.zhaosl@gmail.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Yanan Wang <wangyanan55@huawei.com>, Zhao Liu <zhao1.liu@intel.com>, Palmer Dabbelt <palmer@dabbelt.com>, Weiwei Li <liwei1518@gmail.com>, Daniel Henrique Barboza <dbarboza@ventanamicro.com>, Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, Stefano Stabellini <sstabellini@kernel.org>, Anthony PERARD <anthony@xenproject.org>, Paul Durrant <paul@xen.org>, Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>
There is a newer version of this series
MAINTAINERS                       |  1 +
meson.build                       | 10 ++++-
include/hw/arm/machines-qom.h     | 46 +++++++++++++++++++
include/qemu/target-info.h        | 21 +++++++++
configs/targets/aarch64-softmmu.c | 26 +++++++++++
configs/targets/arm-softmmu.c     | 26 +++++++++++
hw/arm/aspeed.c                   | 27 ++++++++++-
hw/arm/aspeed_ast27x0-fc.c        |  2 +
hw/arm/b-l475e-iot01a.c           |  2 +
hw/arm/bananapi_m2u.c             |  3 +-
hw/arm/collie.c                   |  2 +
hw/arm/cubieboard.c               |  3 +-
hw/arm/digic_boards.c             |  3 +-
hw/arm/exynos4_boards.c           |  3 ++
hw/arm/fby35.c                    |  2 +
hw/arm/highbank.c                 |  3 ++
hw/arm/imx25_pdk.c                |  3 +-
hw/arm/imx8mp-evk.c               |  4 +-
hw/arm/integratorcp.c             |  3 +-
hw/arm/kzm.c                      |  3 +-
hw/arm/mcimx6ul-evk.c             |  4 +-
hw/arm/mcimx7d-sabre.c            |  4 +-
hw/arm/microbit.c                 |  2 +
hw/arm/mps2-tz.c                  |  5 +++
hw/arm/mps2.c                     |  5 +++
hw/arm/mps3r.c                    |  2 +
hw/arm/msf2-som.c                 |  3 +-
hw/arm/musca.c                    |  3 ++
hw/arm/musicpal.c                 |  3 +-
hw/arm/netduino2.c                |  3 +-
hw/arm/netduinoplus2.c            |  3 +-
hw/arm/npcm7xx_boards.c           |  6 +++
hw/arm/npcm8xx_boards.c           |  2 +
hw/arm/olimex-stm32-h405.c        |  3 +-
hw/arm/omap_sx1.c                 |  3 ++
hw/arm/orangepi.c                 |  3 +-
hw/arm/raspi.c                    |  6 +++
hw/arm/raspi4b.c                  |  2 +
hw/arm/realview.c                 |  5 +++
hw/arm/sabrelite.c                |  3 +-
hw/arm/sbsa-ref.c                 |  3 ++
hw/arm/stellaris.c                |  3 ++
hw/arm/stm32vldiscovery.c         |  3 +-
hw/arm/versatilepb.c              |  3 ++
hw/arm/vexpress.c                 |  3 ++
hw/arm/virt-acpi-build.c          |  1 +
hw/arm/virt.c                     | 74 ++++++++++++++++++-------------
hw/arm/xilinx_zynq.c              |  2 +
hw/arm/xlnx-versal-virt.c         |  3 ++
hw/arm/xlnx-zcu102.c              |  2 +
hw/core/null-machine.c            |  6 ++-
hw/riscv/riscv-iommu.c            |  6 ++-
hw/riscv/riscv_hart.c             |  2 +-
hw/xen/xen-hvm-common.c           |  9 ++--
target-info-qom.c                 | 24 ++++++++++
target-info.c                     | 21 +++++++++
target/arm/machine.c              | 18 ++++++++
configs/targets/meson.build       |  5 +++
hw/arm/meson.build                |  8 ++--
hw/xen/meson.build                | 22 ++++-----
60 files changed, 406 insertions(+), 75 deletions(-)
create mode 100644 include/hw/arm/machines-qom.h
create mode 100644 configs/targets/aarch64-softmmu.c
create mode 100644 configs/targets/arm-softmmu.c
create mode 100644 target-info-qom.c
create mode 100644 configs/targets/meson.build
[PULL 00/23] Misc single binary patches for 2025-10-29
Posted by Philippe Mathieu-Daudé 2 weeks, 1 day ago
The following changes since commit e090e0312dc9030d94e38e3d98a88718d3561e4e:

  Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging (2025-10-29 10:44:15 +0100)

are available in the Git repository at:

  https://github.com/philmd/qemu.git tags/single-binary-20251029

for you to fetch changes up to e5c542fa16b0a7d47070692481db301736a0ac7b:

  hw/riscv: Replace target_ulong uses (2025-10-29 19:16:24 +0100)

----------------------------------------------------------------
Various patches related to single binary work:

- Make hw/arm/ common by adding a QOM type to machines to
  tag in which binary (32 or 64-bit) they can be used.
  Convert the Virt and SBSA-Ref machines.
- Build Xen files once

----------------------------------------------------------------

Anton Johansson (1):
  hw/riscv: Replace target_ulong uses

Philippe Mathieu-Daudé (22):
  hw/arm: Register TYPE_TARGET_ARM/AARCH64_MACHINE QOM interfaces
  hw/core: Allow ARM/Aarch64 binaries to use the 'none' machine
  hw/arm: Add DEFINE_MACHINE_ARM() / DEFINE_MACHINE_AARCH64() macros
  hw/arm: Filter machine types for qemu-system-arm/aarch64 binaries
  meson: Prepare to accept per-binary TargetInfo structure
    implementation
  config/target: Implement per-binary TargetInfo structure (ARM,
    AARCH64)
  hw/arm/virt: Register valid CPU types dynamically
  hw/arm/virt: Check accelerator availability at runtime
  qemu/target_info: Add target_arm() helper
  qemu/target_info: Add target_aarch64() helper
  qemu/target_info: Add target_base_arm() helper
  hw/arm/virt: Replace TARGET_AARCH64 -> target_aarch64()
  hw/arm/virt: Get default CPU type at runtime
  hw/arm/sbsa-ref: Include missing 'cpu.h' header
  hw/arm/sbsa-ref: Build only once
  hw/arm/virt-acpi-build: Include missing 'cpu.h' header
  hw/arm/virt-acpi-build: Build only once
  hw/arm/virt: Build only once
  hw/arm/meson: Move Xen files to arm_common_ss[]
  hw/xen: Use BITS_PER_BYTE & MAKE_64BIT_MASK() in req_size_bits()
  hw/xen: Replace target_ulong by agnostic target_long_bits()
  hw/xen: Build only once

 MAINTAINERS                       |  1 +
 meson.build                       | 10 ++++-
 include/hw/arm/machines-qom.h     | 46 +++++++++++++++++++
 include/qemu/target-info.h        | 21 +++++++++
 configs/targets/aarch64-softmmu.c | 26 +++++++++++
 configs/targets/arm-softmmu.c     | 26 +++++++++++
 hw/arm/aspeed.c                   | 27 ++++++++++-
 hw/arm/aspeed_ast27x0-fc.c        |  2 +
 hw/arm/b-l475e-iot01a.c           |  2 +
 hw/arm/bananapi_m2u.c             |  3 +-
 hw/arm/collie.c                   |  2 +
 hw/arm/cubieboard.c               |  3 +-
 hw/arm/digic_boards.c             |  3 +-
 hw/arm/exynos4_boards.c           |  3 ++
 hw/arm/fby35.c                    |  2 +
 hw/arm/highbank.c                 |  3 ++
 hw/arm/imx25_pdk.c                |  3 +-
 hw/arm/imx8mp-evk.c               |  4 +-
 hw/arm/integratorcp.c             |  3 +-
 hw/arm/kzm.c                      |  3 +-
 hw/arm/mcimx6ul-evk.c             |  4 +-
 hw/arm/mcimx7d-sabre.c            |  4 +-
 hw/arm/microbit.c                 |  2 +
 hw/arm/mps2-tz.c                  |  5 +++
 hw/arm/mps2.c                     |  5 +++
 hw/arm/mps3r.c                    |  2 +
 hw/arm/msf2-som.c                 |  3 +-
 hw/arm/musca.c                    |  3 ++
 hw/arm/musicpal.c                 |  3 +-
 hw/arm/netduino2.c                |  3 +-
 hw/arm/netduinoplus2.c            |  3 +-
 hw/arm/npcm7xx_boards.c           |  6 +++
 hw/arm/npcm8xx_boards.c           |  2 +
 hw/arm/olimex-stm32-h405.c        |  3 +-
 hw/arm/omap_sx1.c                 |  3 ++
 hw/arm/orangepi.c                 |  3 +-
 hw/arm/raspi.c                    |  6 +++
 hw/arm/raspi4b.c                  |  2 +
 hw/arm/realview.c                 |  5 +++
 hw/arm/sabrelite.c                |  3 +-
 hw/arm/sbsa-ref.c                 |  3 ++
 hw/arm/stellaris.c                |  3 ++
 hw/arm/stm32vldiscovery.c         |  3 +-
 hw/arm/versatilepb.c              |  3 ++
 hw/arm/vexpress.c                 |  3 ++
 hw/arm/virt-acpi-build.c          |  1 +
 hw/arm/virt.c                     | 74 ++++++++++++++++++-------------
 hw/arm/xilinx_zynq.c              |  2 +
 hw/arm/xlnx-versal-virt.c         |  3 ++
 hw/arm/xlnx-zcu102.c              |  2 +
 hw/core/null-machine.c            |  6 ++-
 hw/riscv/riscv-iommu.c            |  6 ++-
 hw/riscv/riscv_hart.c             |  2 +-
 hw/xen/xen-hvm-common.c           |  9 ++--
 target-info-qom.c                 | 24 ++++++++++
 target-info.c                     | 21 +++++++++
 target/arm/machine.c              | 18 ++++++++
 configs/targets/meson.build       |  5 +++
 hw/arm/meson.build                |  8 ++--
 hw/xen/meson.build                | 22 ++++-----
 60 files changed, 406 insertions(+), 75 deletions(-)
 create mode 100644 include/hw/arm/machines-qom.h
 create mode 100644 configs/targets/aarch64-softmmu.c
 create mode 100644 configs/targets/arm-softmmu.c
 create mode 100644 target-info-qom.c
 create mode 100644 configs/targets/meson.build

-- 
2.51.0


Re: [PULL 00/23] Misc single binary patches for 2025-10-29
Posted by Philippe Mathieu-Daudé 2 weeks, 1 day ago
On 29/10/25 22:39, Philippe Mathieu-Daudé wrote:
> The following changes since commit e090e0312dc9030d94e38e3d98a88718d3561e4e:
> 
>    Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging (2025-10-29 10:44:15 +0100)
> 
> are available in the Git repository at:
> 
>    https://github.com/philmd/qemu.git tags/single-binary-20251029
> 
> for you to fetch changes up to e5c542fa16b0a7d47070692481db301736a0ac7b:
> 
>    hw/riscv: Replace target_ulong uses (2025-10-29 19:16:24 +0100)
> 
> ----------------------------------------------------------------
> Various patches related to single binary work:
> 
> - Make hw/arm/ common by adding a QOM type to machines to
>    tag in which binary (32 or 64-bit) they can be used.
>    Convert the Virt and SBSA-Ref machines.
> - Build Xen files once
> 
> ----------------------------------------------------------------

I'm seeing a failure on mainstream pipeline:

https://gitlab.com/qemu-project/qemu/-/jobs/11906335084
▶  5/68 test_bpim2u.BananaPiMachine.test_arm_bpim2u 
                FAIL
▶  5/68 test_bpim2u.BananaPiMachine.test_arm_bpim2u_gmac 
                FAIL
▶  5/68 test_bpim2u.BananaPiMachine.test_arm_bpim2u_initrd 
                FAIL

which I failed to notice locally in part because Darwin LLVM 'ar'
doesn't not work like the GNU equivalent:

$ pyvenv/bin/meson test --print-errorlogs --setup thorough func-arm-bpim2u
ninja: Entering directory `/build'
[1301/1301] Generating qemu-system-arm with a custom command
▶ 1/1 test_bpim2u.BananaPiMachine.test_arm_bpim2u 
   FAIL
▶ 1/1 test_bpim2u.BananaPiMachine.test_arm_bpim2u_gmac 
   FAIL
▶ 1/1 test_bpim2u.BananaPiMachine.test_arm_bpim2u_initrd 
   FAIL
1/1 qemu:func-thorough+func-arm-thorough+thorough / func-arm-bpim2u 
   ERROR            1.24s   exit status 1
―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― 
✀ 
――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――
stderr:
Traceback (most recent call last):
   File "/src/qemu/tests/functional/arm/test_bpim2u.py", line 41, in 
test_arm_bpim2u
     kernel_path = self.archive_extract(
         self.ASSET_DEB, member='boot/vmlinuz-6.6.16-current-sunxi')
   File "/src/qemu/tests/functional/qemu_test/testcase.py", line 83, in 
archive_extract
     archive_extract(archive, self.scratch_file(), format, member)
     ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   File "/src/qemu/tests/functional/qemu_test/archive.py", line 92, in 
archive_extract
     deb_extract(archive, dest_dir, "./" + member)
     ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   File "/src/qemu/tests/functional/qemu_test/archive.py", line 57, in 
deb_extract
     check_call(['ar', 'x', archive, file_path],
     ~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
                stdout=DEVNULL, stderr=DEVNULL)
                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   File 
"/opt/homebrew/Cellar/python@3.13/3.13.7/Frameworks/Python.framework/Versions/3.13/lib/python3.13/subprocess.py", 
line 419, in check_call
     raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['ar', 'x', 
'~/.cache/qemu/download/3d968c15b121ede871dce49d13ee7644d6f74b6b121b84c9a40f51b0c80d6d22', 
'data.tar.xz/']' returned non-zero exit status 1.

Traceback (most recent call last):
   File "/src/qemu/tests/functional/arm/test_bpim2u.py", line 98, in 
test_arm_bpim2u_gmac
     kernel_path = self.archive_extract(
         self.ASSET_DEB, member='boot/vmlinuz-6.6.16-current-sunxi')
   File "/src/qemu/tests/functional/qemu_test/testcase.py", line 83, in 
archive_extract
     archive_extract(archive, self.scratch_file(), format, member)
     ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   File "/src/qemu/tests/functional/qemu_test/archive.py", line 92, in 
archive_extract
     deb_extract(archive, dest_dir, "./" + member)
     ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   File "/src/qemu/tests/functional/qemu_test/archive.py", line 57, in 
deb_extract
     check_call(['ar', 'x', archive, file_path],
     ~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
                stdout=DEVNULL, stderr=DEVNULL)
                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   File 
"/opt/homebrew/Cellar/python@3.13/3.13.7/Frameworks/Python.framework/Versions/3.13/lib/python3.13/subprocess.py", 
line 419, in check_call
     raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['ar', 'x', 
'~/.cache/qemu/download/3d968c15b121ede871dce49d13ee7644d6f74b6b121b84c9a40f51b0c80d6d22', 
'data.tar.xz/']' returned non-zero exit status 1.

Traceback (most recent call last):
   File "/src/qemu/tests/functional/arm/test_bpim2u.py", line 62, in 
test_arm_bpim2u_initrd
     kernel_path = self.archive_extract(
         self.ASSET_DEB, member='boot/vmlinuz-6.6.16-current-sunxi')
   File "/src/qemu/tests/functional/qemu_test/testcase.py", line 83, in 
archive_extract
     archive_extract(archive, self.scratch_file(), format, member)
     ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   File "/src/qemu/tests/functional/qemu_test/archive.py", line 92, in 
archive_extract
     deb_extract(archive, dest_dir, "./" + member)
     ~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   File "/src/qemu/tests/functional/qemu_test/archive.py", line 57, in 
deb_extract
     check_call(['ar', 'x', archive, file_path],
     ~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
                stdout=DEVNULL, stderr=DEVNULL)
                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   File 
"/opt/homebrew/Cellar/python@3.13/3.13.7/Frameworks/Python.framework/Versions/3.13/lib/python3.13/subprocess.py", 
line 419, in check_call
     raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['ar', 'x', 
'~/.cache/qemu/download/3d968c15b121ede871dce49d13ee7644d6f74b6b121b84c9a40f51b0c80d6d22', 
'data.tar.xz/']' returned non-zero exit status 1.



Re: [PULL 00/23] Misc single binary patches for 2025-10-29
Posted by Philippe Mathieu-Daudé 2 weeks, 1 day ago
On 30/10/25 11:04, Philippe Mathieu-Daudé wrote:
> On 29/10/25 22:39, Philippe Mathieu-Daudé wrote:
>> The following changes since commit 
>> e090e0312dc9030d94e38e3d98a88718d3561e4e:
>>
>>    Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu 
>> into staging (2025-10-29 10:44:15 +0100)
>>
>> are available in the Git repository at:
>>
>>    https://github.com/philmd/qemu.git tags/single-binary-20251029
>>
>> for you to fetch changes up to e5c542fa16b0a7d47070692481db301736a0ac7b:
>>
>>    hw/riscv: Replace target_ulong uses (2025-10-29 19:16:24 +0100)
>>
>> ----------------------------------------------------------------
>> Various patches related to single binary work:
>>
>> - Make hw/arm/ common by adding a QOM type to machines to
>>    tag in which binary (32 or 64-bit) they can be used.
>>    Convert the Virt and SBSA-Ref machines.
>> - Build Xen files once
>>
>> ----------------------------------------------------------------
> 
> I'm seeing a failure on mainstream pipeline:
> 
> https://gitlab.com/qemu-project/qemu/-/jobs/11906335084
> ▶  5/68 test_bpim2u.BananaPiMachine.test_arm_bpim2u                FAIL
> ▶  5/68 test_bpim2u.BananaPiMachine.test_arm_bpim2u_gmac                
> FAIL
> ▶  5/68 test_bpim2u.BananaPiMachine.test_arm_bpim2u_initrd 
>                 FAIL

Thanksfully the fix is very easy, since this is likely due to a typo:

---
diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c
index b5070b46666..0f6d98684b9 100644
--- a/hw/arm/bananapi_m2u.c
+++ b/hw/arm/bananapi_m2u.c
@@ -148 +148 @@ static void bpim2u_machine_init(MachineClass *mc)
-DEFINE_MACHINE_ARM("bpim2u-pdk", bpim2u_machine_init)
+DEFINE_MACHINE_ARM("bpim2u", bpim2u_machine_init)
---