Merge branch 'master' of [email protected]:ddk50/winkvm

Author: ddk

kvm/kernel/kvm_main.c

@@ -1546,7 +1546,7 @@ EXPORT_SYMBOL_GPL(kvm_get_msr_common);
  * Returns 0 on success, non-0 otherwise.
  * Assumes vcpu_load() was already called.
  */
-static int get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata)
+int get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata)
 {
 	return kvm_arch_ops->get_msr(vcpu, msr_index, pdata);
 }

vcproj/kernel/init.c

@@ -512,7 +512,12 @@ __winkvmstab_ioctl(IN PDEVICE_OBJECT DeviceObject,
 
 		case KVM_GET_MSRS:
 			{
+				int r;
+				struct kvm_msrs *umsrs = (struct kvm_msrs*)outBuf;
 				function_enter(DBG_IOCTL, "KVM_GET_MSRS");
+				r = msr_io(get_vcpu(umsrs->vcpu_fd), umsrs, get_msr, 1);
+				Irp->IoStatus.Information = sizeof(struct kvm_msrs) + umsrs->nmsrs * sizeof(struct kvm_msr_entry);
+				ntStatus = ConvertRetval(r);
 				function_exit(DBG_IOCTL, "KVM_GET_MSRS");
 				break;
 			} /* end KVM_GET_MSRS */

vcproj/kernel/kvmdefined.h

@@ -52,5 +52,6 @@ extern int _cdecl msr_io(struct kvm_vcpu *vcpu, struct kvm_msrs *user_msrs,
  * Adapt set_msr() to msr_io()'s calling convention
  */
 int _cdecl do_set_msr(struct kvm_vcpu *vcpu, unsigned index, u64 *data);
+int _cdecl get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata);
 
 #endif