Re: [PATCH] tests: Fix migration-test build failure for sparc

[Dr. David Alan Gilbert]

* Thomas Huth (thuth@redhat.com) wrote:
> On 28/07/2021 23.41, 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.
> > 
> > Reported-by: Richard Henderson <rth@twiddle.net>
> > Signed-off-by: Peter Xu <peterx@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) {
> > 
> 
> Acked-by: Thomas Huth <thuth@redhat.com>
> 
> Juan, Dave, if you don't mind I can take this through my testing branch -
> I'm planning to send a pull request today anyway.

Please do; thanks!

Dave

>  Thomas
> 
-- 
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK