KVM: add hypercall nr to kvm_run

Add the hypercall number to kvm_run and initialize it.  This changes the ABI,
but as this particular ABI was unusable before this no users are affected.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>

2 files changed, 2 insertions, 0 deletions

diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index 69d9ab4e7cb4..20947462f401 100644
--- a/drivers/kvm/kvm_main.c
+++ b/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/include/linux/kvm.h b/include/linux/kvm.h
index 8db01a91e1a7..91a446f450b8 100644
--- a/include/linux/kvm.h
+++ b/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;