Browse Source

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>
Jeff Dike 18 years ago
parent
commit
519ef35341
2 changed files with 2 additions and 0 deletions
  1. 1 0
      drivers/kvm/kvm_main.c
  2. 1 0
      include/linux/kvm.h

+ 1 - 0
drivers/kvm/kvm_main.c

@@ -1378,6 +1378,7 @@ int kvm_hypercall(struct kvm_vcpu *vcpu, struct kvm_run *run)
 	}
 	}
 	switch (nr) {
 	switch (nr) {
 	default:
 	default:
+		run->hypercall.nr = nr;
 		run->hypercall.args[0] = a0;
 		run->hypercall.args[0] = a0;
 		run->hypercall.args[1] = a1;
 		run->hypercall.args[1] = a1;
 		run->hypercall.args[2] = a2;
 		run->hypercall.args[2] = a2;

+ 1 - 0
include/linux/kvm.h

@@ -99,6 +99,7 @@ struct kvm_run {
 		} mmio;
 		} mmio;
 		/* KVM_EXIT_HYPERCALL */
 		/* KVM_EXIT_HYPERCALL */
 		struct {
 		struct {
+			__u64 nr;
 			__u64 args[6];
 			__u64 args[6];
 			__u64 ret;
 			__u64 ret;
 			__u32 longmode;
 			__u32 longmode;