1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index 27f2751c3baa..27e05a77e21a 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -98,7 +98,7 @@ static struct vmx_msr_entry *find_msr_entry(struct kvm_vcpu *vcpu, u32 msr)
         for (i = 0; i < vcpu->nmsrs; ++i)
                 if (vcpu->guest_msrs[i].index == msr)
                         return &vcpu->guest_msrs[i];
-        return 0;
+        return NULL;
 }
 
 static void vmcs_clear(struct vmcs *vmcs)
@@ -1116,6 +1116,8 @@ static int vmx_vcpu_setup(struct kvm_vcpu *vcpu)
 
                 if (rdmsr_safe(index, &data_low, &data_high) < 0)
                         continue;
+                if (wrmsr_safe(index, data_low, data_high) < 0)
+                        continue;
                 data = data_low | ((u64)data_high << 32);
                 vcpu->host_msrs[j].index = index;
                 vcpu->host_msrs[j].reserved = 0;