qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Peter Xu" <peterx@redhat.com>,
	"Richard Henderson" <rth@twiddle.net>
Subject: [PULL 8/9] tests: Fix migration-test build failure for sparc
Date: Thu, 29 Jul 2021 10:22:10 +0200	[thread overview]
Message-ID: <20210729082211.532572-9-thuth@redhat.com> (raw)
In-Reply-To: <20210729082211.532572-1-thuth@redhat.com>

From: Peter Xu <peterx@redhat.com>

Even if <linux/kvm.h> seems to exist for all archs on linux, however including
it with __linux__ defined seems to be not working yet as it'll try to include
asm/kvm.h and that can be missing for archs that do not support kvm.

To fix this (instead of any attempt to fix linux headers..), we can mark the
header to be x86_64 only, because it's so far only service for adding the kvm
dirty ring test.

Fixes: 1f546b709d6 ("tests: migration-test: Add dirty ring test")
Reported-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20210728214128.206198-1-peterx@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qtest/migration-test.c | 5 +++--
 1 file 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) {
-- 
2.27.0



  parent reply	other threads:[~2021-07-29  8:30 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-29  8:22 [PULL 0/9] Gitlab-CI improvements and some other fixes Thomas Huth
2021-07-29  8:22 ` [PULL 1/9] docs: Document GitLab custom CI/CD variables Thomas Huth
2021-07-29  8:22 ` [PULL 2/9] gitlab-ci: Fix 'when:' condition in acceptance_test_job_template Thomas Huth
2021-07-29  8:22 ` [PULL 3/9] gitlab-ci: Fix 'when:' condition in EDK2 jobs Thomas Huth
2021-07-29  8:22 ` [PULL 4/9] gitlab-ci: Fix 'when:' condition in OpenSBI jobs Thomas Huth
2021-07-29  8:22 ` [PULL 5/9] gitlab-ci.d/buildtest: Disable iotests 197 and 215 Thomas Huth
2021-07-29  8:22 ` [PULL 6/9] gitlab-ci.d/buildtest: Mark the aarch64 and ppc64-s390x CFI jobs as manual Thomas Huth
2021-07-29  8:22 ` [PULL 7/9] gitlab-ci.d/custom-runners: Improve rules for the staging branch Thomas Huth
2021-07-29  8:22 ` Thomas Huth [this message]
2021-07-29  9:42   ` [PULL 8/9] tests: Fix migration-test build failure for sparc Philippe Mathieu-Daudé
2021-07-29  8:22 ` [PULL 9/9] configure script fix for Haiku Thomas Huth
2021-07-29 15:06 ` [PULL 0/9] Gitlab-CI improvements and some other fixes Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210729082211.532572-9-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=peterx@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=rth@twiddle.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).