add a kvm_get/set_msrs()

Author: ddk50

kvm/kernel/include/linux/kvm.h

@@ -234,6 +234,9 @@ struct kvm_msr_entry {
 
 /* for KVM_GET_MSRS and KVM_SET_MSRS */
 struct kvm_msrs {
+#ifdef __WINKVM__
+  int vcpu_fd;  
+#endif
   __u32 nmsrs; /* number of msrs in entries */
   __u32 pad;
 

kvm/kernel/kvm_main.c

@@ -851,6 +851,8 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,
 	int cleared;
 	unsigned long any = 0;
 
+	function_enter(DBG_LIVEMIGRATION, __FUNCTION__);   
+
 	spin_lock(&kvm->lock);
 
 	/*
@@ -901,6 +903,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,
 	spin_lock(&kvm->lock);
 	--kvm->busy;
 	spin_unlock(&kvm->lock);
+	function_exit(DBG_LIVEMIGRATION, __FUNCTION__);	
 	return r;
 }
 
@@ -1938,7 +1941,7 @@ static __init void kvm_init_msr_list(void)
 /*
  * Adapt set_msr() to msr_io()'s calling convention
  */
-static int do_set_msr(struct kvm_vcpu *vcpu, unsigned index, u64 *data)
+int do_set_msr(struct kvm_vcpu *vcpu, unsigned index, u64 *data)  
 {
 	return set_msr(vcpu, index, *data);
 }
@@ -1971,10 +1974,10 @@ static int __msr_io(struct kvm_vcpu *vcpu, struct kvm_msrs *msrs,
  *
  * @return number of msrs set successfully.
  */
-static int msr_io(struct kvm_vcpu *vcpu, struct kvm_msrs __user *user_msrs,
-		  int (*do_msr)(struct kvm_vcpu *vcpu,
-				unsigned index, u64 *data),
-		  int writeback)
+int msr_io(struct kvm_vcpu *vcpu, struct kvm_msrs __user *user_msrs,
+		   int (*do_msr)(struct kvm_vcpu *vcpu,
+						 unsigned index, u64 *data),
+		   int writeback) 
 {
 	struct kvm_msrs msrs;
 	struct kvm_msr_entry *entries;

vcproj/include/linux/kvm.h

@@ -234,6 +234,9 @@ struct kvm_msr_entry {
 
 /* for KVM_GET_MSRS and KVM_SET_MSRS */
 struct kvm_msrs {
+#ifdef __WINKVM__
+  int vcpu_fd;  
+#endif
   __u32 nmsrs; /* number of msrs in entries */
   __u32 pad;
 

vcproj/include/linux/winkvm.h

@@ -122,7 +122,9 @@ enum dbgmsg_level {
 	DBG_MISC = 0,	
 	DBG_INIT,	
 	DBG_RELEASE,
-	DBG_DESTROY_KVM_MMU,	
+	DBG_DESTROY_KVM_MMU,
+	DBG_LIVEMIGRATION,
+	DBG_IOCTL,	
 };
 
 #endif

vcproj/include/linux/winkvmint.h

@@ -2,8 +2,6 @@
 #ifndef _WINKVMINT_H_
 #define _WINKVMINT_H_
 
-//#ifdef _MSC_VER
-
 /* FIXME */
 #define __WORDSIZE  32
 
@@ -61,6 +59,4 @@ typedef unsigned int            size_t;
 
 typedef int bool;
 
-//#endif /* _MSC_VER */
-
 #endif /* _WINKVMINT_H_ */