diff options
| -rw-r--r-- | drivers/kvm/kvm.h | 2 | ||||
| -rw-r--r-- | drivers/kvm/kvm_main.c | 3 | ||||
| -rw-r--r-- | drivers/kvm/svm.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h index e34e246eafec..c4ad66bb5e08 100644 --- a/drivers/kvm/kvm.h +++ b/drivers/kvm/kvm.h @@ -398,7 +398,7 @@ static inline struct kvm_ioapic *ioapic_irqchip(struct kvm *kvm) static inline int irqchip_in_kernel(struct kvm *kvm) { - return pic_irqchip(kvm) != 0; + return pic_irqchip(kvm) != NULL; } struct descriptor_table { diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index 3946025f3d37..7335435f528e 100644 --- a/drivers/kvm/kvm_main.c +++ b/drivers/kvm/kvm_main.c @@ -1449,7 +1449,8 @@ int kvm_init(void *opaque, unsigned int vcpu_size, /* A kmem cache lets us meet the alignment requirements of fx_save. */ kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, - __alignof__(struct kvm_vcpu), 0, 0); + __alignof__(struct kvm_vcpu), + 0, NULL); if (!kvm_vcpu_cache) { r = -ENOMEM; goto out_free_4; diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c index 0ccbef18476a..a1a7f39ff3f1 100644 --- a/drivers/kvm/svm.c +++ b/drivers/kvm/svm.c @@ -1271,7 +1271,7 @@ static int handle_exit(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) exit_code); if (exit_code >= ARRAY_SIZE(svm_exit_handlers) - || svm_exit_handlers[exit_code] == 0) { + || !svm_exit_handlers[exit_code]) { kvm_run->exit_reason = KVM_EXIT_UNKNOWN; kvm_run->hw.hardware_exit_reason = exit_code; return 0; |
