Commit a5543d34 authored Dec 20, 2019 by Sean Christopherson Committed by Borislav Petkov Jan 13, 2020

selftests, kvm: Replace manual MSR defs with common msr-index.h



The kernel's version of msr-index.h was pulled wholesale into tools by
commit

  444e2ff3 ("tools arch x86: Grab a copy of the file containing the MSR numbers"),

Use the common msr-index.h instead of manually redefining everything in
a KVM-only header.

Note, a few MSR-related definitions remain in processor.h because they
are not covered by msr-index.h, including the awesomely named
APIC_BASE_MSR, which refers to starting index of the x2APIC MSRs, not
the actual MSR_IA32_APICBASE, which *is* defined by msr-index.h.

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20191221044513.21680-3-sean.j.christopherson@intel.com

parent 32ad73db

tools/testing/selftests/kvm/Makefile

+3 −1

Original line number	Diff line number	Diff line
		@@ -45,9 +45,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
		LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/x86/include
		CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99 \
		-fno-stack-protector -fno-PIE -I$(LINUX_TOOL_INCLUDE) \
		-I$(LINUX_HDR_PATH) -Iinclude -I$(<D) -Iinclude/$(UNAME_M) -I..
		-I$(LINUX_TOOL_ARCH_INCLUDE) -I$(LINUX_HDR_PATH) -Iinclude \
		-I$(<D) -Iinclude/$(UNAME_M) -I..

		no-pie-option := $(call try-run, echo 'int main() { return 0; }' \| \
		$(CC) -Werror -no-pie -x c - -o "$$TMP", -no-pie)

tools/testing/selftests/kvm/include/x86_64/processor.h

+3 −723

File changed.

Preview size limit exceeded, changes collapsed.

Admin message