fix struct type passed to kvm_vcpu_ioctl_get_msrs

Author: YanChii

kvm.c

@@ -2058,9 +2058,9 @@ kvm_ioctl(dev_t dev, int cmd, intptr_t arg, int md, cred_t *cr, int *rv)
 		{ KVM_X86_SETUP_MCE, kvm_vcpu_ioctl_x86_setup_mce,
 		    sizeof (uint64_t) },
 		{ KVM_GET_MSRS, kvm_vcpu_ioctl_get_msrs,
-		    sizeof (struct kvm_msrs), B_TRUE },
+		    sizeof (struct msr_data), B_TRUE },
 		{ KVM_SET_MSRS, kvm_vcpu_ioctl_set_msrs,
-		    sizeof (struct kvm_msrs) },
+		    sizeof (struct msr_data) },
 		{ KVM_GET_MP_STATE, kvm_arch_vcpu_ioctl_get_mpstate,
 		    sizeof (struct kvm_mp_state), B_TRUE },
 		{ KVM_SET_MP_STATE, kvm_arch_vcpu_ioctl_set_mpstate,

kvm_host.h

@@ -367,8 +367,8 @@ extern int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *,
     struct kvm_guest_debug *);
 extern int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *);
 
-extern int kvm_vcpu_ioctl_get_msrs(struct kvm_vcpu *, struct kvm_msrs *, int *);
-extern int kvm_vcpu_ioctl_set_msrs(struct kvm_vcpu *, struct kvm_msrs *, int *);
+extern int kvm_vcpu_ioctl_get_msrs(struct kvm_vcpu *, struct msr_data *, int *);
+extern int kvm_vcpu_ioctl_set_msrs(struct kvm_vcpu *, struct msr_data *, int *);
 extern int kvm_vcpu_ioctl_x86_setup_mce(struct kvm_vcpu *, uint64_t *);
 extern int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *, struct kvm_cpuid2 *);
 extern int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *, struct kvm_cpuid2 *,

kvm_x86.c

@@ -1525,14 +1525,14 @@ __msr_io(struct kvm_vcpu *vcpu, struct kvm_msrs *msrs,
 }
 
 int
-kvm_vcpu_ioctl_get_msrs(struct kvm_vcpu *vcpu, struct kvm_msrs *msrs, int *rv)
+kvm_vcpu_ioctl_get_msrs(struct kvm_vcpu *vcpu, struct msr_data *msrs, int *rv)
 {
 	int r;
 
-	if (msrs->nmsrs >= MAX_IO_MSRS)
+	if (msrs->info.nmsrs >= MAX_IO_MSRS)
 		return (-E2BIG);
 
-	if ((r = __msr_io(vcpu, msrs, msrs->entries, kvm_get_msr)) < 0)
+	if ((r = __msr_io(vcpu, &msrs->info, msrs->entries, kvm_get_msr)) < 0)
 		return (r);
 
 	*rv = r;
@@ -1541,14 +1541,14 @@ kvm_vcpu_ioctl_get_msrs(struct kvm_vcpu *vcpu, struct kvm_msrs *msrs, int *rv)
 }
 
 int
-kvm_vcpu_ioctl_set_msrs(struct kvm_vcpu *vcpu, struct kvm_msrs *msrs, int *rv)
+kvm_vcpu_ioctl_set_msrs(struct kvm_vcpu *vcpu, struct msr_data *msrs, int *rv)
 {
 	int r;
 
-	if (msrs->nmsrs >= MAX_IO_MSRS)
+	if (msrs->info.nmsrs >= MAX_IO_MSRS)
 		return (-E2BIG);
 
-	if ((r = __msr_io(vcpu, msrs, msrs->entries, do_set_msr)) < 0)
+	if ((r = __msr_io(vcpu, &msrs->info, msrs->entries, do_set_msr)) < 0)
 		return (-EINVAL);
 
 	*rv = r;

kvm_x86.h

@@ -155,6 +155,11 @@ typedef struct kvm_msrs {
 	struct kvm_msr_entry entries[100];
 } kvm_msrs_t;
 
+typedef struct msr_data {
+	struct kvm_msrs info;
+	struct kvm_msr_entry entries[100];
+} msr_data_t;
+
 /* for KVM_GET_MSR_INDEX_LIST */
 typedef struct kvm_msr_list {
 	uint32_t nmsrs; /* number of msrs in entries */