diff options
| author | Peter Maydell | 2021-07-29 14:17:20 +0200 |
|---|---|---|
| committer | Peter Maydell | 2021-07-29 14:17:20 +0200 |
| commit | 3521ade3510eb5cefb2e27a101667f25dad89935 (patch) | |
| tree | 9f906ec56cfc1773869bc3db20d15f185f8a9930 /tests | |
| parent | Merge remote-tracking branch 'remotes/dg-gitlab/tags/ppc-for-6.1-20210729' in... (diff) | |
| parent | configure script fix for Haiku (diff) | |
| download | qemu-3521ade3510eb5cefb2e27a101667f25dad89935.tar.gz qemu-3521ade3510eb5cefb2e27a101667f25dad89935.tar.xz qemu-3521ade3510eb5cefb2e27a101667f25dad89935.zip | |
Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-07-29' into staging
* Document GitLab custom CI/CD variables
* Fix 'when:' condition in gitlab-CI jobs
* Disable tests in the gitlab-CI that fail due to out-of-memory conditions
* Allow pushing to "staging" again for maintainers without s390x access
* Fix migration-test build failure on SPARC
* Compile without "pie" on Haiku
# gpg: Signature made Thu 29 Jul 2021 07:17:17 BST
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/thuth-gitlab/tags/pull-request-2021-07-29:
configure script fix for Haiku
tests: Fix migration-test build failure for sparc
gitlab-ci.d/custom-runners: Improve rules for the staging branch
gitlab-ci.d/buildtest: Mark the aarch64 and ppc64-s390x CFI jobs as manual
gitlab-ci.d/buildtest: Disable iotests 197 and 215
gitlab-ci: Fix 'when:' condition in OpenSBI jobs
gitlab-ci: Fix 'when:' condition in EDK2 jobs
gitlab-ci: Fix 'when:' condition in acceptance_test_job_template
docs: Document GitLab custom CI/CD variables
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qtest/migration-test.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 1e8b7784ef..cc5e83d98a 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -27,7 +27,8 @@ #include "migration-helpers.h" #include "tests/migration/migration-test.h" -#if defined(__linux__) +/* For dirty ring test; so far only x86_64 is supported */ +#if defined(__linux__) && defined(HOST_X86_64) #include "linux/kvm.h" #endif @@ -1395,7 +1396,7 @@ static void test_multifd_tcp_cancel(void) static bool kvm_dirty_ring_supported(void) { -#if defined(__linux__) +#if defined(__linux__) && defined(HOST_X86_64) int ret, kvm_fd = open("/dev/kvm", O_RDONLY); if (kvm_fd < 0) { |