Branch: refs/heads/staging
Home: https://github.com/qemu/qemu
Commit: df3b3046059edfae4b36cafe513f69d0c1ae78d5
https://github.com/qemu/qemu/commit/df3b3046059edfae4b36cafe513f69d0c1ae78d5
Author: Philippe Mathieu-Daudé <[email protected]>
Date: 2025-12-09 (Tue, 09 Dec 2025)
Changed paths:
M include/qemu/osdep.h
Log Message:
-----------
osdep: Undefine FSCALE definition to fix Solaris builds
Solaris defines FSCALE in <sys/param.h>:
301 /*
302 * Scale factor for scaled integers used to count
303 * %cpu time and load averages.
304 */
305 #define FSHIFT 8 /* bits to right of fixed binary point */
306 #define FSCALE (1<<FSHIFT)
When emulating the SVE FSCALE instruction, we defines the same name
in decodetree format in target/arm/tcg/sve.decode:
1129:FSCALE 01100101 .. 00 1001 100 ... ..... ..... @rdn_pg_rm
This leads to a definition clash:
In file included from ../target/arm/tcg/translate-sve.c:21:
../target/arm/tcg/translate.h:875:17: error: pasting "trans_" and "(" does
not give a valid preprocessing token
875 | static bool trans_##NAME(DisasContext *s, arg_##NAME *a) \
| ^~~~~~
../target/arm/tcg/translate-sve.c:4205:5: note: in expansion of macro
'TRANS_FEAT'
4205 | TRANS_FEAT(NAME, FEAT, gen_gvec_fpst_arg_zpzz,
name##_zpzz_fns[a->esz], a)
| ^~~~~~~~~~
../target/arm/tcg/translate-sve.c:4249:1: note: in expansion of macro
'DO_ZPZZ_FP'
4249 | DO_ZPZZ_FP(FSCALE, aa64_sve, sve_fscalbn)
| ^~~~~~~~~~
../target/arm/tcg/translate-sve.c:4249:12: error: expected declaration
specifiers or '...' before numeric constant
4249 | DO_ZPZZ_FP(FSCALE, aa64_sve, sve_fscalbn)
| ^~~~~~
../target/arm/tcg/translate.h:875:25: note: in definition of macro
'TRANS_FEAT'
875 | static bool trans_##NAME(DisasContext *s, arg_##NAME *a) \
| ^~~~
../target/arm/tcg/translate-sve.c:4249:1: note: in expansion of macro
'DO_ZPZZ_FP'
4249 | DO_ZPZZ_FP(FSCALE, aa64_sve, sve_fscalbn)
| ^~~~~~~~~~
../target/arm/tcg/translate.h:875:47: error: pasting "arg_" and "(" does not
give a valid preprocessing token
875 | static bool trans_##NAME(DisasContext *s, arg_##NAME *a) \
| ^~~~
../target/arm/tcg/translate-sve.c:4205:5: note: in expansion of macro
'TRANS_FEAT'
4205 | TRANS_FEAT(NAME, FEAT, gen_gvec_fpst_arg_zpzz,
name##_zpzz_fns[a->esz], a)
| ^~~~~~~~~~
../target/arm/tcg/translate-sve.c:4249:1: note: in expansion of macro
'DO_ZPZZ_FP'
4249 | DO_ZPZZ_FP(FSCALE, aa64_sve, sve_fscalbn)
| ^~~~~~~~~~
In file included from ../target/arm/tcg/translate-sve.c:100:
libqemu-aarch64-softmmu.a.p/decode-sve.c.inc:1227:13: warning: 'trans_FSCALE'
used but never defined
1227 | static bool trans_FSCALE(DisasContext *ctx, arg_FSCALE *a);
| ^~~~~~~~~~~~
../target/arm/tcg/translate-sve.c:4249:30: warning: 'sve_fscalbn_zpzz_fns'
defined but not used [-Wunused-const-variable=]
4249 | DO_ZPZZ_FP(FSCALE, aa64_sve, sve_fscalbn)
| ^~~~~~~~~~~
../target/arm/tcg/translate-sve.c:4201:42: note: in definition of macro
'DO_ZPZZ_FP'
4201 | static gen_helper_gvec_4_ptr * const name##_zpzz_fns[4] = { \
| ^~~~
As a kludge, undefine it globally in <qemu/osdep.h>.
Suggested-by: Richard Henderson <[email protected]>
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Richard Henderson <[email protected]>
Message-Id: <[email protected]>
Commit: 93332c90bfcd91d4a30104d53650e4355db0a099
https://github.com/qemu/qemu/commit/93332c90bfcd91d4a30104d53650e4355db0a099
Author: Alano Song <[email protected]>
Date: 2025-12-09 (Tue, 09 Dec 2025)
Changed paths:
M hw/9pfs/xen-9p-backend.c
Log Message:
-----------
hw/9pfs: Correct typo
Correct comment typo in xen_9pfs_bh()
Signed-off-by: Alano Song <[email protected]>
Reviewed-by: Christian Schoenebeck <[email protected]>
Reviewed-by: Thomas Huth <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Commit: 8062bfd517645e0219fe302839fad7231bebf61d
https://github.com/qemu/qemu/commit/8062bfd517645e0219fe302839fad7231bebf61d
Author: Denis V. Lunev <[email protected]>
Date: 2025-12-09 (Tue, 09 Dec 2025)
Changed paths:
M scripts/modinfo-collect.py
Log Message:
-----------
scripts: fix broken error path in modinfo-collect.py
sys.stderr.print is dropped long ago and should not be used. Official
replacement is sys.stderr.write
The problem has been found debugging building on some fancy platform
derived from Debian.
Signed-off-by: Denis V. Lunev <[email protected]>
CC: John Snow <[email protected]>
CC: Cleber Rosa <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Commit: 46228925edd53bb0569519538b94e10b85f9c001
https://github.com/qemu/qemu/commit/46228925edd53bb0569519538b94e10b85f9c001
Author: Hanna Czenczek <[email protected]>
Date: 2025-12-09 (Tue, 09 Dec 2025)
Changed paths:
M hw/virtio/vhost.c
Log Message:
-----------
vhost: Always initialize cached vring data
vhost_virtqueue_start() can exit early if the descriptor ring address is
0, assuming the virtqueue isn’t ready to start.
In this case, all cached vring information (size, physical address,
pointer) is left as-is. This is OK at first startup, when that info is
still initialized to 0, but after a reset, it will retain old (outdated)
information.
vhost_virtqueue_start() must make sure these values are (re-)set
properly before exiting.
(When using an IOMMU, these outdated values can stall the device:
vhost_dev_start() deliberately produces an IOMMU miss event for each
used vring. If used_phys contains an outdated value, the resulting
lookup may fail, forcing the device to be stopped.)
Cc: [email protected]
Signed-off-by: Hanna Czenczek <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Commit: 0bc6fa244618b3a70cc09c328c4e7d0625a11a96
https://github.com/qemu/qemu/commit/0bc6fa244618b3a70cc09c328c4e7d0625a11a96
Author: Stefan Weil <[email protected]>
Date: 2025-12-09 (Tue, 09 Dec 2025)
Changed paths:
M migration/postcopy-ram.c
Log Message:
-----------
migration: Fix order of function arguments
This fixes a compiler error when higher warning levels are enabled:
../migration/postcopy-ram.c: In function ‘postcopy_temp_pages_setup’:
../migration/postcopy-ram.c:1483:50: error: ‘g_malloc0_n’ sizes specified with
‘sizeof’ in the earlier argument and not in the later argument
[-Werror=calloc-transposed-args]
1483 | mis->postcopy_tmp_pages = g_malloc0_n(sizeof(PostcopyTmpPage),
channels);
| ^~~~~~~~~~~~~~~
../migration/postcopy-ram.c:1483:50: note: earlier argument should specify
number of elements, later size of each element
Avoid also a related int/unsigned mismatch by fixing the type of
two local variables.
Signed-off-by: Stefan Weil <[email protected]>
Reviewed-by: Laurent Vivier <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Message-ID: <[email protected]>
[PMD: Replace g_malloc0_n() by g_new0()]
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Acked-by: Peter Xu <[email protected]>
Message-Id: <[email protected]>
Commit: 4fdff25625724f682a1174d53ccf8b0d099733ca
https://github.com/qemu/qemu/commit/4fdff25625724f682a1174d53ccf8b0d099733ca
Author: Stefan Weil <[email protected]>
Date: 2025-12-09 (Tue, 09 Dec 2025)
Changed paths:
M include/hw/pci/pci.h
Log Message:
-----------
hw/pci: Fix typo in documentation
Signed-off-by: Stefan Weil <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Laurent Vivier <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Commit: e742b7bdc244499761a21bc1965580c6261a74bf
https://github.com/qemu/qemu/commit/e742b7bdc244499761a21bc1965580c6261a74bf
Author: Stefan Weil <[email protected]>
Date: 2025-12-09 (Tue, 09 Dec 2025)
Changed paths:
M scripts/nsis.py
Log Message:
-----------
scripts/nsis.py: Tell makensis that WoA is 64 bit
This fixes some settings like the default installation path
for the QEMU installation on Windows on ARM (WoA).
Signed-off-by: Stefan Weil <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Commit: 326e620fc0145686124f754194cdc6d0d9b3400d
https://github.com/qemu/qemu/commit/326e620fc0145686124f754194cdc6d0d9b3400d
Author: Cédric Le Goater <[email protected]>
Date: 2025-12-09 (Tue, 09 Dec 2025)
Changed paths:
M backends/tpm/tpm_passthrough.c
M block/vmdk.c
M block/vvfat.c
M gdbstub/gdbstub.c
M qga/commands-linux.c
M ui/ui-hmp-cmds.c
M util/log.c
Log Message:
-----------
Fix const qualifier build errors with recent glibc
A recent change in glibc 2.42.9000 [1] changes the return type of
strstr() and other string functions to be 'const char *' when the
input is a 'const char *'.
This breaks the build in various files with errors such as :
error: initialization discards 'const' qualifier from pointer target type
[-Werror=discarded-qualifiers]
208 | char *pidstr = strstr(filename, "%");
| ^~~~~~
Fix this by changing the type of the variables that store the result
of these functions to 'const char *'.
[1]
https://sourceware.org/git/?p=glibc.git;a=commit;h=cd748a63ab1a7ae846175c532a3daab341c62690
Signed-off-by: Cédric Le Goater <[email protected]>
Reviewed-by: Laurent Vivier <[email protected]>
Reviewed-by: Peter Maydell <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Commit: 0d42e48c73d3840fec57a6c4309b9a078138c6ce
https://github.com/qemu/qemu/commit/0d42e48c73d3840fec57a6c4309b9a078138c6ce
Author: Philippe Mathieu-Daudé <[email protected]>
Date: 2025-12-09 (Tue, 09 Dec 2025)
Changed paths:
M include/migration/vmstate.h
Log Message:
-----------
Revert "migration/vmstate: remove VMSTATE_BUFFER_POINTER_UNSAFE macro"
Next commit will re-use VMSTATE_BUFFER_POINTER_UNSAFE().
This reverts commit 58341158d022823234d25fd337654a82fa6d157b.
Suggested-by: Fiona Ebner <[email protected]>
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Commit: efd6b3d1768d04d5491b62ad7385f623fb12f627
https://github.com/qemu/qemu/commit/efd6b3d1768d04d5491b62ad7385f623fb12f627
Author: Philippe Mathieu-Daudé <[email protected]>
Date: 2025-12-09 (Tue, 09 Dec 2025)
Changed paths:
M hw/net/virtio-net.c
M include/hw/virtio/virtio-net.h
Log Message:
-----------
Revert "hw/net/virtio-net: make VirtIONet.vlans an array instead of a pointer"
Per
https://lore.kernel.org/qemu-devel/[email protected]/:
Loading a VM state taken with v10.1.2 or older doesn't work anymore,
using the script [*] we get:
kvm: VQ 1 size 0x100 < last_avail_idx 0x9 - used_idx 0x3e30
kvm: load of migration failed: Operation not permitted: error while loading
state for instance 0x0 of device '0000:00:13.0/virtio-net': Failed to load
element of type virtio for virtio: -1
qemu-system-x86_64: Missing section footer for 0000:00:13.0/virtio-net
qemu-system-x86_64: Section footer error, section_id: 41
[*]:
#!/bin/bash
rm /tmp/disk.qcow2
args="
-netdev
type=tap,id=net1,ifname=tap104i1,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on
-device
virtio-net-pci,mac=BC:24:11:32:3C:69,netdev=net1,bus=pci.0,addr=0x13,id=net1
-machine type=pc-i440fx-10.1
"
$1/qemu-img create -f qcow2 /tmp/disk.qcow2 1G
$1/qemu-system-x86_64 --qmp stdio --blockdev
qcow2,node-name=node0,file.driver=file,file.filename=/tmp/disk.qcow2 $args <<EOF
{"execute": "qmp_capabilities"}
{"execute": "snapshot-save", "arguments": { "job-id": "save0", "tag": "snap",
"vmstate": "node0", "devices": ["node0"] } }
{"execute": "quit"}
EOF
$2/qemu-system-x86_64 --qmp stdio --blockdev
qcow2,node-name=node0,file.driver=file,file.filename=/tmp/disk.qcow2 $args
-loadvm snap
This reverts commit 3a9cd2a4a1571266dea37398de04f650c2a72d86.
Reported-by: Fiona Ebner <[email protected]>
Suggested-by: Fiona Ebner <[email protected]>
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Commit: bf0e7b068b7d156eb2009776c9b90afdf93abb2f
https://github.com/qemu/qemu/commit/bf0e7b068b7d156eb2009776c9b90afdf93abb2f
Author: Richard Henderson <[email protected]>
Date: 2025-12-09 (Tue, 09 Dec 2025)
Changed paths:
M backends/tpm/tpm_passthrough.c
M block/vmdk.c
M block/vvfat.c
M gdbstub/gdbstub.c
M hw/9pfs/xen-9p-backend.c
M hw/net/virtio-net.c
M hw/virtio/vhost.c
M include/hw/pci/pci.h
M include/hw/virtio/virtio-net.h
M include/migration/vmstate.h
M include/qemu/osdep.h
M migration/postcopy-ram.c
M qga/commands-linux.c
M scripts/modinfo-collect.py
M scripts/nsis.py
M ui/ui-hmp-cmds.c
M util/log.c
Log Message:
-----------
Merge tag 'hw-misc-20251209' of https://github.com/philmd/qemu into staging
Misc HW / migration / typo fixes
# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmk4gN0ACgkQ4+MsLN6t
# wN6wPw/9EiBPEumIFhsGQZdB4pZZBgjBgOilkazeVaitWwfjhZGWTB6l5O0+aEmH
# jCeK2AAUZEashB/CrGI9irQ8Zli/CGgzV8/pF25AHDnDFyhCwR2czxeVDiZtMmcE
# tOYfjqs57/85r0OiQHHzqgp7w25p/p0Toz5g9GR+7Wu8xFi5SkHVM2gblSViz9ks
# JY+RLnQN4KKessqFKwGJb/m6cnBUWTf3DCscD/j+Crb9OI3WQpz2DsbQaZ06NHR7
# hlPzQ05taMhIqh6OdRAGqGS7Mud+eQ58k9qkYGuSBUkuBoJ/3/EqHJXQ4blZt9IN
# reJ6EtN+xYTT+BGBhIXmAtIVERzyk1MF99hgUZJW0RDuE4Ioa7Omp5bnv82Yensz
# UledFAMrGpX25SlJG2oNGnqZTYnCYoQnRQTB90AlaluJqHSpSgBBoJyfukjKQDVa
# NmL+sJOthonvGsydJP8IYfmcBUC1AzmXFxzN+/xZOSJe1qmSh1kUaehsbyytdd/C
# tgyav8DsvxXR8rfYBX5bSml8pAKL5pSD0DYJD3LCyvRoC0SnYROFU1kaUfMpPA+/
# H1r0RO5Lzkcub1JW253gA89GfrK0Y7ShMtoJ+GBivH/cK+ZYT4uEAZajcgUi5kJJ
# FSWz/sNxOJ03s3CWQhlPOEnkLQ41/1+eqbLpmWceRIAfOmmXE00=
# =vcUd
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 09 Dec 2025 02:04:45 PM CST
# gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <[email protected]>"
[unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE
* tag 'hw-misc-20251209' of https://github.com/philmd/qemu:
Revert "hw/net/virtio-net: make VirtIONet.vlans an array instead of a pointer"
Revert "migration/vmstate: remove VMSTATE_BUFFER_POINTER_UNSAFE macro"
Fix const qualifier build errors with recent glibc
scripts/nsis.py: Tell makensis that WoA is 64 bit
hw/pci: Fix typo in documentation
migration: Fix order of function arguments
vhost: Always initialize cached vring data
scripts: fix broken error path in modinfo-collect.py
hw/9pfs: Correct typo
osdep: Undefine FSCALE definition to fix Solaris builds
Signed-off-by: Richard Henderson <[email protected]>
Compare: https://github.com/qemu/qemu/compare/17313df8799b...bf0e7b068b7d
To unsubscribe from these emails, change your notification settings at
https://github.com/qemu/qemu/settings/notifications
