Skip to content

Commit 2a8d017

Browse files
committed
tools headers kvm: Sync linux/kvm.h with the kernel sources
To pick up the changes from: 7de3f14 ("KVM: s390: Add new reset vcpu API") So far we're ignoring those arch specific ioctls, we need to revisit this at some time to have arch specific tables, etc: $ grep S390 tools/perf/trace/beauty/kvm_ioctl.sh egrep -v " ((ARM|PPC|S390)_|[GS]ET_(DEBUGREGS|PIT2|XSAVE|TSC_KHZ)|CREATE_SPAPR_TCE_64)" | \ $ This addresses these tools/perf build warnings: Warning: Kernel ABI header at 'tools/arch/arm/include/uapi/asm/kvm.h' differs from latest version at 'arch/arm/include/uapi/asm/kvm.h' diff -u tools/arch/arm/include/uapi/asm/kvm.h arch/arm/include/uapi/asm/kvm.h Cc: Adrian Hunter <[email protected]> Cc: Christian Borntraeger <[email protected]> Cc: Janosch Frank <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 391df72 commit 2a8d017

File tree

1 file changed

+5
-0
lines changed
  • tools/include/uapi/linux

1 file changed

+5
-0
lines changed

tools/include/uapi/linux/kvm.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,6 +1009,7 @@ struct kvm_ppc_resize_hpt {
10091009
#define KVM_CAP_PPC_GUEST_DEBUG_SSTEP 176
10101010
#define KVM_CAP_ARM_NISV_TO_USER 177
10111011
#define KVM_CAP_ARM_INJECT_EXT_DABT 178
1012+
#define KVM_CAP_S390_VCPU_RESETS 179
10121013

10131014
#ifdef KVM_CAP_IRQ_ROUTING
10141015

@@ -1473,6 +1474,10 @@ struct kvm_enc_region {
14731474
/* Available with KVM_CAP_ARM_SVE */
14741475
#define KVM_ARM_VCPU_FINALIZE _IOW(KVMIO, 0xc2, int)
14751476

1477+
/* Available with KVM_CAP_S390_VCPU_RESETS */
1478+
#define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)
1479+
#define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4)
1480+
14761481
/* Secure Encrypted Virtualization command */
14771482
enum sev_cmd_id {
14781483
/* Guest initialization commands */

0 commit comments

Comments
 (0)