From: Peter Maydell Date: Fri, 14 May 2021 18:33:23 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-05-14'... X-Git-Tag: qemu-xen-4.16.0-rc4~174 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9b1e81d1c231e7c9fa3a42b68d12a0482d51589c;p=qemu-xen.git Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-05-14' into staging * Replace YAML anchors by extends in the gitlab-CI yaml files * Many small qtest fixes (e.g. to fix issues discovered by Coverity) * Poison more config switches in common code * Fix the failing Travis-CI and Cirrus-CI tasks # gpg: Signature made Fri 14 May 2021 12:17:39 BST # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "thuth@redhat.com" # gpg: Good signature from "Thomas Huth " [full] # gpg: aka "Thomas Huth " [full] # gpg: aka "Thomas Huth " [full] # gpg: aka "Thomas Huth " [unknown] # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * remotes/thuth-gitlab/tags/pull-request-2021-05-14: cirrus.yml: Fix the MSYS2 task pc-bios/s390-ccw: Fix inline assembly for older versions of Clang tests/qtest/migration-test: Use g_autofree to avoid leaks on error paths configure: Poison all current target-specific #defines migration: Move populate_vfio_info() into a separate file include/sysemu: Poison all accelerator CONFIG switches in common code tests: Avoid side effects inside g_assert() arguments tests/qtest/rtc-test: Remove pointless NULL check tests/qtest/tpm-util.c: Free memory with correct free function tests/migration-test: Fix "true" vs true tests/qtest/npcm7xx_pwm-test.c: Avoid g_assert_true() for non-test assertions tests/qtest/ahci-test.c: Calculate iso_size with 64-bit arithmetic util/compatfd.c: Replaced a malloc call with g_malloc. libqtest: refuse QTEST_QEMU_BINARY=qemu-kvm docs/devel/qgraph: add troubleshooting information libqos/qgraph: fix "UNAVAILBLE" typo gitlab-ci: Replace YAML anchors by extends (native_test_job) gitlab-ci: Replace YAML anchors by extends (native_build_job) gitlab-ci: Replace YAML anchors by extends (container_job) tests/docker/dockerfiles: Add ccache to containers where it was missing Signed-off-by: Peter Maydell --- 9b1e81d1c231e7c9fa3a42b68d12a0482d51589c diff --cc migration/migration.h index f7b388d718,2730fa05c0..b88bd8fe07 --- a/migration/migration.h +++ b/migration/migration.h @@@ -375,6 -375,7 +375,8 @@@ int foreach_not_ignored_block(RAMBlockI void migration_make_urgent_request(void); void migration_consume_urgent_request(void); bool migration_rate_limit(void); +void migration_cancel(void); + void populate_vfio_info(MigrationInfo *info); + #endif