tools headers kvm: Sync kvm headers with the kernel sources (391df72f) · Commits · 戴 / test

To pick up the changes from: ("arm64: KVM: Add UAPI notes for swapped registers") No tools changes are caused by this. This addresses these tools/perf build warnings: Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Andrew Jones <drjones@redhat.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Marc Zyngier <maz@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/arch/arm64/include/uapi/asm/kvm.h

+10 −2

Original line number	Diff line number	Diff line
		@@ -220,10 +220,18 @@ struct kvm_vcpu_events {
		#define KVM_REG_ARM_PTIMER_CVAL ARM64_SYS_REG(3, 3, 14, 2, 2)
		#define KVM_REG_ARM_PTIMER_CNT ARM64_SYS_REG(3, 3, 14, 0, 1)

		/* EL0 Virtual Timer Registers */
		/*
		* EL0 Virtual Timer Registers
		*
		* WARNING:
		* KVM_REG_ARM_TIMER_CVAL and KVM_REG_ARM_TIMER_CNT are not defined
		* with the appropriate register encodings. Their values have been
		* accidentally swapped. As this is set API, the definitions here
		* must be used, rather than ones derived from the encodings.
		*/
		#define KVM_REG_ARM_TIMER_CTL ARM64_SYS_REG(3, 3, 14, 3, 1)
		#define KVM_REG_ARM_TIMER_CNT ARM64_SYS_REG(3, 3, 14, 3, 2)
		#define KVM_REG_ARM_TIMER_CVAL ARM64_SYS_REG(3, 3, 14, 0, 2)
		#define KVM_REG_ARM_TIMER_CNT ARM64_SYS_REG(3, 3, 14, 3, 2)

		/* KVM-as-firmware specific pseudo-registers */
		#define KVM_REG_ARM_FW (0x0014 << KVM_REG_ARM_COPROC_SHIFT)

Admin message