Commit 49f2675f authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers UAPI: Sync linux/kvm.h with the kernel sources 



To pick the changes in:

  30b5c851 ("KVM: x86/xen: Add support for vCPU runstate information")

That don't cause any change in tooling as it doesn't introduce any new
ioctl, just parameters to existing one.

This silences this perf build warning:

  Warning: Kernel ABI header at 'tools/include/uapi/linux/kvm.h' differs from latest version at 'include/uapi/linux/kvm.h'
  diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c3d59cfd

tools/include/uapi/linux/kvm.h

+13 −0
Original line number Diff line number Diff line
@@ -1154,6 +1154,7 @@ struct kvm_x86_mce { 
#define KVM_XEN_HVM_CONFIG_HYPERCALL_MSR	(1 << 0)

#define KVM_XEN_HVM_CONFIG_INTERCEPT_HCALL	(1 << 1)

#define KVM_XEN_HVM_CONFIG_SHARED_INFO		(1 << 2)

#define KVM_XEN_HVM_CONFIG_RUNSTATE		(1 << 3)



struct kvm_xen_hvm_config {

	__u32 flags;
@@ -1621,12 +1622,24 @@ struct kvm_xen_vcpu_attr { 
	union {

		__u64 gpa;

		__u64 pad[8];

		struct {

			__u64 state;

			__u64 state_entry_time;

			__u64 time_running;

			__u64 time_runnable;

			__u64 time_blocked;

			__u64 time_offline;

		} runstate;

	} u;

};



/* Available with KVM_CAP_XEN_HVM / KVM_XEN_HVM_CONFIG_SHARED_INFO */

#define KVM_XEN_VCPU_ATTR_TYPE_VCPU_INFO	0x0

#define KVM_XEN_VCPU_ATTR_TYPE_VCPU_TIME_INFO	0x1

#define KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_ADDR	0x2

#define KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_CURRENT	0x3

#define KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_DATA	0x4

#define KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_ADJUST	0x5



/* Secure Encrypted Virtualization command */

enum sev_cmd_id {