On 7/28/21 11:41 PM, Peter Xu wrote:
> 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.
>
> No need to have "Fixes" as the issue is just introduced very recently.
Personally I find it very useful to navigate in gitk without having
to use git-blame.
Fixes: 1f546b709d6 ("tests: migration-test: Add dirty ring test")
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
>
> Reported-by: Richard Henderson <[email protected]>
> Signed-off-by: Peter Xu <[email protected]>
> ---
> 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) {
>
