starred/qemu-qemu-1
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging

Browse Source 
trivial patches for 2026-04-08

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCgAdFiEEZKoqtTHVaQM2a/75gqpKJDselHgFAmnWM84ACgkQgqpKJDse
# lHgJMxAAuz4rJQh51cTA1vKa/Pte//BZ4ro9dVnCi2ogCVjmy/ZaD6r2B8ZJtpHo
# RMXbTrswGF1Hs6J5HxztcMHNHE9fO+2CGjhgjujCsvs72Msdp5j6TjQ61DzIG3UL
# jz3g7fGPxabOyiJcMi61QMIMwcOQlS4WSZhvcRtxixc6KpY6fx5uCXpvEKUIzumQ
# WSmTkHVah4C8D05jUWmD5jF2krAUvf0XjsGDIYidjXRwsnORnBSZdHGoukQ8rGl9
# 6OjvuWT9UZIM7nXv76lPkk3APVFL4q9FMNoc3GxcTzHMWyvYknOM5KI4tDFhncqh
# 0gvie5OalWCxrzq8inGy3o+3v0/ggsOG/mjyN9tR5nas6qsqzya6PHaPoXbLn/uq
# ibsV+LOtjo65w0uJUV1LRn1TwG6bBQBKO1pdYmx3SouaY8dF9UsNTsvhiyFOdBge
# 7ZnjzoMmD33USkSWbAL5icGHSAShsIvJkQfWd8lrsx46dzuePC/DwGp8S384sNA+
# j0Ecqd/ar0cBfGi9mToKHufrGZS4S4R4xdVU41k2eA5AmhaEQ4D3BkWaZC7ocx59
# Q5s2N/XMDK6CX7OEkIAEy6Oi8DyO8vl/hozEI/USpc6OqUM/eX74WH7dR2fKaDZa
# D+36iSHOKQK2wgPVHaeBrfjobgFXY+/MGFGPMlvk9Z4q4zQNZ2Y=
# =XP94
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Apr  8 11:54:06 2026 BST
# gpg:                using RSA key 64AA2AB531D56903366BFEF982AA4A243B1E9478
# gpg: Good signature from "Michael Tokarev <mjt@debian.org>" [full]
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>" [full]
# gpg:                 aka "Michael Tokarev <mjt@tls.msk.ru>" [full]
# Primary key fingerprint: 9D8B E14E 3F2A 9DD7 9199  28F1 61AD 3D98 ECDF 2C8E
#      Subkey fingerprint: 64AA 2AB5 31D5 6903 366B  FEF9 82AA 4A24 3B1E 9478

* tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu:
  util: fix missing aio_wait sym in qemu guest agent only build
  Allow building qemu tools on 32-bit hosts
  util/meson.build: do not add cpuinfo-$arch to util_ss for 32bit CPUs

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
2026-04-08 13:34:10 +01:00
parent 4e4832dd72 17fbf3e18c
commit 6d3e9dddef
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
util/meson.build
View File

@@ -79,6 +79,7 @@ endif
if have_block or have_ga
util_ss.add(files('aiocb.c', 'async.c'))
util_ss.add(files('aio-wait.c'))
util_ss.add(files('base64.c'))
util_ss.add(files('main-loop.c'))
util_ss.add(files('qemu-coroutine.c', 'qemu-coroutine-lock.c', 'qemu-coroutine-io.c'))
@@ -87,7 +88,6 @@ if have_block or have_ga
util_ss.add(files('qemu-sockets.c'))
endif
if have_block
util_ss.add(files('aio-wait.c'))
util_ss.add(files('buffer.c'))
util_ss.add(files('bufferiszero.c'))
util_ss.add(files('hbitmap.c'))
@@ -116,13 +116,13 @@ endif
if cpu == 'aarch64'
util_ss.add(files('cpuinfo-aarch64.c'))
elif cpu in ['x86', 'x86_64']
elif cpu == 'x86_64'
util_ss.add(files('cpuinfo-i386.c'))
elif cpu == 'loongarch64'
util_ss.add(files('cpuinfo-loongarch.c'))
elif cpu in ['ppc', 'ppc64']
elif cpu == 'ppc64'
util_ss.add(files('cpuinfo-ppc.c'))
elif cpu in ['riscv32', 'riscv64']
elif cpu == 'riscv64'
util_ss.add(files('cpuinfo-riscv.c'))
elif cpu == 's390x'
util_ss.add(files('s390x_pci_mmio.c'))