[v3,1/2] headers: KVM Hyper-V VMBus hypercalls defines and exit

Commit Message

Andrey Smetanin Feb. 24, 2016, 10:22 a.m. UTC

This patch brings in the necessary changes from the corresponding kernel
patchset.  It's included only for completeness; ideally these changes
should arrive via the standard kernel header pull.

Signed-off-by: Andrey Smetanin <[e-mail]>
Reviewed-by: Roman Kagan <[e-mail]>
CC: Paolo Bonzini <[e-mail]>
CC: Richard Henderson <[e-mail]>
CC: Eduardo Habkost <[e-mail]>
CC: "Andreas Färber" <[e-mail]>
CC: Marcelo Tosatti <[e-mail]>
CC: Roman Kagan <[e-mail]>
CC: Denis V. Lunev <[e-mail]>
CC: [e-mail]
---
 include/standard-headers/asm-x86/hyperv.h | 4 +++-
 linux-headers/linux/kvm.h                 | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

Patch

diff --git a/include/standard-headers/asm-x86/hyperv.h b/include/standard-headers/asm-x86/hyperv.h
index acb119d..47b38fb 100644
--- a/include/standard-headers/asm-x86/hyperv.h
+++ b/include/standard-headers/asm-x86/hyperv.h
@@ -226,7 +226,9 @@ 
 		(~((1ull << HV_X64_MSR_HYPERCALL_PAGE_ADDRESS_SHIFT) - 1))
 
 /* Declare the various hypercall operations. */
-#define HV_X64_HV_NOTIFY_LONG_SPIN_WAIT		0x0008
+#define HVCALL_NOTIFY_LONG_SPIN_WAIT		0x0008
+#define HVCALL_POST_MESSAGE			0x005c
+#define HVCALL_SIGNAL_EVENT			0x005d
 
 #define HV_X64_MSR_APIC_ASSIST_PAGE_ENABLE		0x00000001
 #define HV_X64_MSR_APIC_ASSIST_PAGE_ADDRESS_SHIFT	12
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
index 4e20262..08e652e 100644
--- a/linux-headers/linux/kvm.h
+++ b/linux-headers/linux/kvm.h
@@ -157,6 +157,7 @@  struct kvm_s390_skeys {
 
 struct kvm_hyperv_exit {
 #define KVM_EXIT_HYPERV_SYNIC          1
+#define KVM_EXIT_HYPERV_HCALL          2
 	__u32 type;
 	union {
 		struct {
@@ -165,6 +166,11 @@  struct kvm_hyperv_exit {
 			__u64 evt_page;
 			__u64 msg_page;
 		} synic;
+		struct {
+			__u64 input;
+			__u64 result;
+			__u64 params[2];
+		} hcall;
 	} u;
 };