Allow builds when ARCH=x86 since the top-level Makefile can set ARCH=x86
even for 64-bit x86 builds.

Note that ARCH=x86 could also indicate a native build on a 32-bit x86
host. However, it doesn't seem like anyone is building selftests
natively on 32-bit x86 hosts these days since KVM selftests allow
ARCH=x86 and fail to compile on 32-bit x86.

If someone reports an issue on 32-bit native builds we can harden the
KVM and VFIO selftests to explicitly check 64-bit (see the discussion in
the Closes link below).

Fixes: a55d4bbbe644 ("vfio: selftests: only build tests on arm64 and x86_64")
Reported-by: Jason Gunthorpe <jgg@nvidia.com>
Closes: https://lore.kernel.org/kvm/20260427231217.GA1670652@nvidia.com/
Signed-off-by: David Matlack <dmatlack@google.com>
---
Cc: Sean Christopherson <seanjc@google.com>

 tools/testing/selftests/vfio/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/vfio/Makefile b/tools/testing/selftests/vfio/Makefile
index 0684932d91bf..40165d087a0b 100644
--- a/tools/testing/selftests/vfio/Makefile
+++ b/tools/testing/selftests/vfio/Makefile
@@ -1,6 +1,6 @@
 ARCH ?= $(shell uname -m)
 
-ifeq (,$(filter $(ARCH),aarch64 arm64 x86_64))
+ifeq (,$(filter $(ARCH),aarch64 arm64 x86 x86_64))
 # Do nothing on unsupported architectures
 include ../lib.mk
 else

base-commit: 2a4c0c11c0193889446cdb6f1540cc2b9aff97dd
-- 
2.54.0.545.g6539524ca2-goog

On Tue, 28 Apr 2026 23:27:06 +0000
David Matlack <dmatlack@google.com> wrote:

> Allow builds when ARCH=x86 since the top-level Makefile can set ARCH=x86
> even for 64-bit x86 builds.
> 
> Note that ARCH=x86 could also indicate a native build on a 32-bit x86
> host. However, it doesn't seem like anyone is building selftests
> natively on 32-bit x86 hosts these days since KVM selftests allow
> ARCH=x86 and fail to compile on 32-bit x86.
> 
> If someone reports an issue on 32-bit native builds we can harden the
> KVM and VFIO selftests to explicitly check 64-bit (see the discussion in
> the Closes link below).
> 
> Fixes: a55d4bbbe644 ("vfio: selftests: only build tests on arm64 and x86_64")
> Reported-by: Jason Gunthorpe <jgg@nvidia.com>
> Closes: https://lore.kernel.org/kvm/20260427231217.GA1670652@nvidia.com/
> Signed-off-by: David Matlack <dmatlack@google.com>
> ---
> Cc: Sean Christopherson <seanjc@google.com>
> 
>  tools/testing/selftests/vfio/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/vfio/Makefile b/tools/testing/selftests/vfio/Makefile
> index 0684932d91bf..40165d087a0b 100644
> --- a/tools/testing/selftests/vfio/Makefile
> +++ b/tools/testing/selftests/vfio/Makefile
> @@ -1,6 +1,6 @@
>  ARCH ?= $(shell uname -m)
>  
> -ifeq (,$(filter $(ARCH),aarch64 arm64 x86_64))
> +ifeq (,$(filter $(ARCH),aarch64 arm64 x86 x86_64))
>  # Do nothing on unsupported architectures
>  include ../lib.mk
>  else
> 
> base-commit: 2a4c0c11c0193889446cdb6f1540cc2b9aff97dd

Applied to vfio next branch for v7.2.  Thanks,

Alex

On Tue, Apr 28, 2026 at 11:27:06PM +0000, David Matlack wrote:
> Allow builds when ARCH=x86 since the top-level Makefile can set ARCH=x86
> even for 64-bit x86 builds.
> 
> Note that ARCH=x86 could also indicate a native build on a 32-bit x86
> host. However, it doesn't seem like anyone is building selftests
> natively on 32-bit x86 hosts these days since KVM selftests allow
> ARCH=x86 and fail to compile on 32-bit x86.
> 
> If someone reports an issue on 32-bit native builds we can harden the
> KVM and VFIO selftests to explicitly check 64-bit (see the discussion in
> the Closes link below).
> 
> Fixes: a55d4bbbe644 ("vfio: selftests: only build tests on arm64 and x86_64")
> Reported-by: Jason Gunthorpe <jgg@nvidia.com>
> Closes: https://lore.kernel.org/kvm/20260427231217.GA1670652@nvidia.com/
> Signed-off-by: David Matlack <dmatlack@google.com>
> ---
> Cc: Sean Christopherson <seanjc@google.com>
> 
>  tools/testing/selftests/vfio/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>

Jason