Skip to content

Commit 8db38af

Browse files
committed
tools kvm headers arm64: Update KVM headers from the kernel sources
To pick the changes from: 34739fd ("KVM: arm64: Indicate SYSTEM_RESET2 in kvm_run::system_event flags field") 583cda1 ("KVM: arm64: Refuse to run VCPU if the PMU doesn't match the physical CPU") That don't causes any changes in tooling (when built on x86), only addresses this perf build warning: Warning: Kernel ABI header at 'tools/arch/arm64/include/uapi/asm/kvm.h' differs from latest version at 'arch/arm64/include/uapi/asm/kvm.h' diff -u tools/arch/arm64/include/uapi/asm/kvm.h arch/arm64/include/uapi/asm/kvm.h Cc: Marc Zyngier <maz@kernel.org> Cc: Will Deacon <will@kernel.org> Cc: Alexandru Elisei <alexandru.elisei@arm.com> Link: https://lore.kernel.org/lkml/YkSB4Q7kWmnaqeZU@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 672b259 commit 8db38af

1 file changed

Lines changed: 10 additions & 0 deletions

File tree

  • tools/arch/arm64/include/uapi/asm

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,16 @@ struct kvm_arm_copy_mte_tags {
419419
#define KVM_PSCI_RET_INVAL PSCI_RET_INVALID_PARAMS
420420
#define KVM_PSCI_RET_DENIED PSCI_RET_DENIED
421421

422+
/* arm64-specific kvm_run::system_event flags */
423+
/*
424+
* Reset caused by a PSCI v1.1 SYSTEM_RESET2 call.
425+
* Valid only when the system event has a type of KVM_SYSTEM_EVENT_RESET.
426+
*/
427+
#define KVM_SYSTEM_EVENT_RESET_FLAG_PSCI_RESET2 (1ULL << 0)
428+
429+
/* run->fail_entry.hardware_entry_failure_reason codes. */
430+
#define KVM_EXIT_FAIL_ENTRY_CPU_UNSUPPORTED (1ULL << 0)
431+
422432
#endif
423433

424434
#endif /* __ARM_KVM_H__ */

0 commit comments

Comments
 (0)