From a116dd13cb81bbcd8cf6b7b00262ba59e22c300d Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Mon, 16 Jul 2007 15:24:47 -0400
Subject: [PATCH] --- yaml --- r: 68364 b: refs/heads/master c:
 519ef35341b4f360f072ea74e398b70a5a2fc270 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/kvm/kvm_main.c | 1 +
 trunk/include/linux/kvm.h    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8d8077a271f1..4c5e936f9647 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c3d14fe0ab75337a3f6c06b6bc18bcbc2b3d0bc
+refs/heads/master: 519ef35341b4f360f072ea74e398b70a5a2fc270
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
index 69d9ab4e7cb4..20947462f401 100644
--- a/trunk/drivers/kvm/kvm_main.c
+++ b/trunk/drivers/kvm/kvm_main.c
@@ -1378,6 +1378,7 @@ int kvm_hypercall(struct kvm_vcpu *vcpu, struct kvm_run *run)
 	}
 	switch (nr) {
 	default:
+		run->hypercall.nr = nr;
 		run->hypercall.args[0] = a0;
 		run->hypercall.args[1] = a1;
 		run->hypercall.args[2] = a2;
diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h
index 8db01a91e1a7..91a446f450b8 100644
--- a/trunk/include/linux/kvm.h
+++ b/trunk/include/linux/kvm.h
@@ -99,6 +99,7 @@ struct kvm_run {
 		} mmio;
 		/* KVM_EXIT_HYPERCALL */
 		struct {
+			__u64 nr;
 			__u64 args[6];
 			__u64 ret;
 			__u32 longmode;