diff options
Diffstat (limited to 'drivers/kvm/svm.c')
-rw-r--r-- | drivers/kvm/svm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c index c79df79307ed..85f61dd1e936 100644 --- a/drivers/kvm/svm.c +++ b/drivers/kvm/svm.c | |||
@@ -274,7 +274,7 @@ static void svm_hardware_disable(void *garbage) | |||
274 | wrmsrl(MSR_VM_HSAVE_PA, 0); | 274 | wrmsrl(MSR_VM_HSAVE_PA, 0); |
275 | rdmsrl(MSR_EFER, efer); | 275 | rdmsrl(MSR_EFER, efer); |
276 | wrmsrl(MSR_EFER, efer & ~MSR_EFER_SVME_MASK); | 276 | wrmsrl(MSR_EFER, efer & ~MSR_EFER_SVME_MASK); |
277 | per_cpu(svm_data, raw_smp_processor_id()) = 0; | 277 | per_cpu(svm_data, raw_smp_processor_id()) = NULL; |
278 | __free_page(svm_data->save_area); | 278 | __free_page(svm_data->save_area); |
279 | kfree(svm_data); | 279 | kfree(svm_data); |
280 | } | 280 | } |
@@ -642,7 +642,7 @@ static struct vmcb_seg *svm_seg(struct kvm_vcpu *vcpu, int seg) | |||
642 | case VCPU_SREG_LDTR: return &save->ldtr; | 642 | case VCPU_SREG_LDTR: return &save->ldtr; |
643 | } | 643 | } |
644 | BUG(); | 644 | BUG(); |
645 | return 0; | 645 | return NULL; |
646 | } | 646 | } |
647 | 647 | ||
648 | static u64 svm_get_segment_base(struct kvm_vcpu *vcpu, int seg) | 648 | static u64 svm_get_segment_base(struct kvm_vcpu *vcpu, int seg) |
@@ -934,7 +934,7 @@ static int io_get_override(struct kvm_vcpu *vcpu, | |||
934 | return 0; | 934 | return 0; |
935 | 935 | ||
936 | *addr_override = 0; | 936 | *addr_override = 0; |
937 | *seg = 0; | 937 | *seg = NULL; |
938 | for (i = 0; i < ins_length; i++) | 938 | for (i = 0; i < ins_length; i++) |
939 | switch (inst[i]) { | 939 | switch (inst[i]) { |
940 | case 0xf0: | 940 | case 0xf0: |
@@ -1087,7 +1087,7 @@ static int cpuid_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) | |||
1087 | 1087 | ||
1088 | static int emulate_on_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) | 1088 | static int emulate_on_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) |
1089 | { | 1089 | { |
1090 | if (emulate_instruction(vcpu, 0, 0, 0) != EMULATE_DONE) | 1090 | if (emulate_instruction(vcpu, NULL, 0, 0) != EMULATE_DONE) |
1091 | printk(KERN_ERR "%s: failed\n", __FUNCTION__); | 1091 | printk(KERN_ERR "%s: failed\n", __FUNCTION__); |
1092 | return 1; | 1092 | return 1; |
1093 | } | 1093 | } |