842038f55c
-----BEGIN PGP SIGNATURE----- iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAl9b0MsSHGxhdXJlbnRA dml2aWVyLmV1AAoJEPMMOL0/L748UH0QAIQYMn0U5eMWREg+DOEEj2n/6h04lTeE K93RsaQ9OsB0cZvwZ08sGoHI6FyfPR8S5yFe5as1ykGcGyO4vNwqxxPeRvqSfgwX 2nkldYwgkOLYsjOD+1G16f/TGJ3MWbUxyn6ta/cSVg+BhbSvMHT3SXTLQ3PB7Lvf 1j3Y3B0BUBAjPh1sNIvBkEV1ZGlV9tqu+XviUf4hfqZOVSTsSb7prtuGVYz9GsH2 RxEcPXQKNWei2eQET4l8otcBpV3dz0D/6sap8nAP8pz0VARn7hJXIn5f8USFHHfg LMWbXrB9I2bjqSmRqhGofxhGMaH2uKQvpv46MyCDel7eMENNj6F+ER2a+7J8Apy8 vVWYg8qVA85rfxQcb7nHuDrLQiD/C1o1uZcV1O/Mwkm7typUcpPn00pQLxhEDf9O xta1/EU8X+7kgTIKWMwpC0HwponOfHiG1TCyzbQ91FiTb/peeOzejTQi88YRNZFV NEg1XIo79Q/no05F/j3nrju2ESzBQTA1F+Jms8aI6Q40nXPaXEjg7IA510os7Py7 uCEtoQ7qEM4lHfuSl67AR2J/NVWlWbZDsjqhxiMsYLR85rkARIf/7fsVIi9ELKOQ AYZdfA/LebovUcp9kDfYHPvDzifGMmv2ppD3mcZWhGuuQTJ06sRMPxQbUF6LBVMc 64FEl8o3wFgv =/CqY -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pull-request' into staging trivial patches pull request 20200911 # gpg: Signature made Fri 11 Sep 2020 20:32:27 BST # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laurent@vivier.eu" # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full] # gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier2/tags/trivial-branch-for-5.2-pull-request: target/i386/kvm: Add missing fallthrough comment util/hexdump: Reorder qemu_hexdump() arguments util/hexdump: Convert to take a void pointer argument hw/arm/pxa2xx: Add missing fallthrough comment target/i386/kvm: Rename host_tsx_blacklisted() as host_tsx_broken() test-vmstate: remove unnecessary code in match_interval_mapping_node hw: hyperv: vmbus: Fix 32bit compilation kconfig: fix comment referring to old Makefiles meson.build: tweak sdl-image error message hw/net/e1000e: Remove duplicated write handler for FLSWDATA register hw/net/e1000e: Remove overwritten read handler for STATUS register Makefile: Skip the meson subdir in cscope/TAGS/ctags Makefile: Drop extra phony cscope hw/gpio/max7310: Replace disabled printf() by qemu_log_mask(UNIMP) hw/gpio/omap_gpio: Replace fprintf() by qemu_log_mask(GUEST_ERROR) hw/acpi/tco: Remove unused definitions hw/isa/isa-bus: Replace hw_error() by assert() hw/mips/fuloong2e: Convert pointless error message to an assert() Signed-off-by: Peter Maydell <peter.maydell@linaro.org> # Conflicts: # net/colo-compare.c |
||
---|---|---|
.. | ||
acceptance | ||
data | ||
decode | ||
docker | ||
fp | ||
guest-debug | ||
image-fuzzer | ||
include | ||
keys | ||
migration | ||
multiboot | ||
perf/block/qcow2 | ||
plugin | ||
qapi-schema | ||
qemu-iotests | ||
qtest | ||
rocker | ||
tcg | ||
tsan | ||
uefi-test-tools | ||
vm | ||
vmstate-static-checker-data | ||
.gitignore | ||
atomic64-bench.c | ||
atomic_add-bench.c | ||
benchmark-crypto-cipher.c | ||
benchmark-crypto-hash.c | ||
benchmark-crypto-hmac.c | ||
check-block-qdict.c | ||
check-block.sh | ||
check-qdict.c | ||
check-qjson.c | ||
check-qlist.c | ||
check-qlit.c | ||
check-qnull.c | ||
check-qnum.c | ||
check-qobject.c | ||
check-qom-interface.c | ||
check-qom-proplist.c | ||
check-qstring.c | ||
crypto-tls-psk-helpers.c | ||
crypto-tls-psk-helpers.h | ||
crypto-tls-x509-helpers.c | ||
crypto-tls-x509-helpers.h | ||
dbus-vmstate-daemon.sh | ||
io-channel-helpers.c | ||
io-channel-helpers.h | ||
iothread.c | ||
iothread.h | ||
Makefile.include | ||
meson.build | ||
pkix_asn1_tab.c | ||
ptimer-test-stubs.c | ||
ptimer-test.c | ||
ptimer-test.h | ||
qht-bench.c | ||
rcutorture.c | ||
requirements.txt | ||
socket-helpers.c | ||
socket-helpers.h | ||
test-aio-multithread.c | ||
test-aio.c | ||
test-authz-list.c | ||
test-authz-listfile.c | ||
test-authz-pam.c | ||
test-authz-simple.c | ||
test-base64.c | ||
test-bdrv-drain.c | ||
test-bdrv-graph-mod.c | ||
test-bitcnt.c | ||
test-bitmap.c | ||
test-bitops.c | ||
test-block-backend.c | ||
test-block-iothread.c | ||
test-blockjob-txn.c | ||
test-blockjob.c | ||
test-bufferiszero.c | ||
test-char.c | ||
test-clone-visitor.c | ||
test-coroutine.c | ||
test-crypto-afsplit.c | ||
test-crypto-block.c | ||
test-crypto-cipher.c | ||
test-crypto-hash.c | ||
test-crypto-hmac.c | ||
test-crypto-ivgen.c | ||
test-crypto-pbkdf.c | ||
test-crypto-secret.c | ||
test-crypto-tlscredsx509.c | ||
test-crypto-tlssession.c | ||
test-crypto-xts.c | ||
test-cutils.c | ||
test-hbitmap.c | ||
test-image-locking.c | ||
test-int128.c | ||
test-io-channel-buffer.c | ||
test-io-channel-command.c | ||
test-io-channel-file.c | ||
test-io-channel-socket.c | ||
test-io-channel-tls.c | ||
test-io-task.c | ||
test-iov.c | ||
test-keyval.c | ||
test-logging.c | ||
test-mul64.c | ||
test-opts-visitor.c | ||
test-qapi-util.c | ||
test-qdev-global-props.c | ||
test-qdist.c | ||
test-qemu-opts.c | ||
test-qga.c | ||
test-qgraph.c | ||
test-qht-par.c | ||
test-qht.c | ||
test-qmp-cmds.c | ||
test-qmp-event.c | ||
test-qobject-input-visitor.c | ||
test-qobject-output-visitor.c | ||
test-rcu-list.c | ||
test-rcu-simpleq.c | ||
test-rcu-slist.c | ||
test-rcu-tailq.c | ||
test-replication.c | ||
test-shift128.c | ||
test-string-input-visitor.c | ||
test-string-output-visitor.c | ||
test-thread-pool.c | ||
test-throttle.c | ||
test-timed-average.c | ||
test-util-filemonitor.c | ||
test-util-sockets.c | ||
test-uuid.c | ||
test-visitor-serialization.c | ||
test-vmstate.c | ||
test-write-threshold.c | ||
test-x86-cpuid.c | ||
test-xbzrle.c | ||
vhost-user-bridge.c |