lkml.org 
[lkml]   [2020]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 342/388] KVM: selftests: Fix build with "make ARCH=x86_64"
    Date
    From: Vitaly Kuznetsov <vkuznets@redhat.com>

    [ Upstream commit b80db73dc8be7022adae1b4414a1bebce50fe915 ]

    Marcelo reports that kvm selftests fail to build with
    "make ARCH=x86_64":

    gcc -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99
    -fno-stack-protector -fno-PIE -I../../../../tools/include
    -I../../../../tools/arch/x86_64/include -I../../../../usr/include/
    -Iinclude -Ilib -Iinclude/x86_64 -I.. -c lib/kvm_util.c
    -o /var/tmp/20200604202744-bin/lib/kvm_util.o

    In file included from lib/kvm_util.c:11:
    include/x86_64/processor.h:14:10: fatal error: asm/msr-index.h: No such
    file or directory

    #include <asm/msr-index.h>
    ^~~~~~~~~~~~~~~~~
    compilation terminated.

    "make ARCH=x86", however, works. The problem is that arch specific headers
    for x86_64 live in 'tools/arch/x86/include', not in
    'tools/arch/x86_64/include'.

    Fixes: 66d69e081b52 ("selftests: fix kvm relocatable native/cross builds and installs")
    Reported-by: Marcelo Bandeira Condotta <mcondotta@redhat.com>
    Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
    Message-Id: <20200605142028.550068-1-vkuznets@redhat.com>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/selftests/kvm/Makefile | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
    index 42f4f49f2a48..2c85b9dd86f5 100644
    --- a/tools/testing/selftests/kvm/Makefile
    +++ b/tools/testing/selftests/kvm/Makefile
    @@ -80,7 +80,11 @@ LIBKVM += $(LIBKVM_$(UNAME_M))
    INSTALL_HDR_PATH = $(top_srcdir)/usr
    LINUX_HDR_PATH = $(INSTALL_HDR_PATH)/include/
    LINUX_TOOL_INCLUDE = $(top_srcdir)/tools/include
    +ifeq ($(ARCH),x86_64)
    +LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/x86/include
    +else
    LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/$(ARCH)/include
    +endif
    CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99 \
    -fno-stack-protector -fno-PIE -I$(LINUX_TOOL_INCLUDE) \
    -I$(LINUX_TOOL_ARCH_INCLUDE) -I$(LINUX_HDR_PATH) -Iinclude \
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-18 03:19    [W:4.052 / U:0.376 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site