From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753334AbdATScC (ORCPT ); Fri, 20 Jan 2017 13:32:02 -0500 Received: from mout.web.de ([212.227.15.4]:52694 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753186AbdATScA (ORCPT ); Fri, 20 Jan 2017 13:32:00 -0500 Subject: [PATCH 05/11] KVM: PPC: Book3S HV: Adjust nine checks for null pointers To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Alexander Graf , Benjamin Herrenschmidt , Michael Ellerman , Paolo Bonzini , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= References: Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: <161c8660-d204-5190-9bda-c5a801abe0ab@users.sourceforge.net> Date: Fri, 20 Jan 2017 19:23:59 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:990vjp2VtRDPkYiJu9+QYVzc30GhZ+JdDnAgEL1kGHMSXQghvjL X1NknchHN8L30VA2orNpjkIPwrjTmbmgEAEdWR5mqmQTYkashxcj/skQmnxkTg4OaIyItSp iGpYCGDt72ozRzTli2ITaeo63xqipp81Dy7AjWw1dMax8NMTfxhbHuJfrVd3/DULrAyezfv XpTdRqCjoIom+EvC+DQPw== X-UI-Out-Filterresults: notjunk:1;V01:K0:NOp7aYQ04Wo=:OnMQTemxls5qRuCarsLkYR PuT8n03MBeTEvdoemrzQEOXor5TP01BoNK2WA5mVNfWFwDwDSbMkaLPH8ORRK7SIY2v9kYoMc p0Ijvw6H2W+kuTkdnnJf6yM0KRHgUzlqjcxVbCZX3fbSAIT0LsW4wPurTvq7y/9ZzQpKip9Cl q1I7w0f4hb5xbHzHPpzu6gN3Ycnnl5D4YgRrqn5tBzjAW/NuKFmJL2iLQeQcR7EWVUAU5scAX YhGFgS0wXszTTMYnR4mhA2muSIjPIVSGGEF8Q3kQ6zn1A4odk8IYHX0cSzPDmJIE6bV32bL5m uVX0RJY9/mBITmIRflwxNjuRLzu6ktBKfPM1hQd3RgOxhvRrUZZTGEjq2IGThxn8vYdYVarM2 OzB8ZewhTllK2OogzUHpJD994u6K6ajw2yK+ezHCBbMOWeZf4SeAJIdr3BBc4Il+FFzi+ZNny 72+9NrcdTTFH54sAt5Yuj38LiYBprLc4UFdIQiBXwo8rq4QZrYMw3R1AaNegIyjb/uBZwCDRP vvP0tCXnII/V3Y64nE3KFqZjFFsoZbwFOx8jy3WqipoBILYgP0BnLD6Z+iCxePqtsgJI9wwGl czMi7YowaClC1X+v/hKGs+T3cQaQbICTfqAK8txKrqHAXPCiAO8DVTe7BoFEA0a7o1fTbwggt dtss+V81IORbRHGJIwuYAfj8tAWGdnqJiFyS0ZA+fjCF6Beb2yw9nyojHewrk+u1v5LKr6myD DYUxrg8vjIdoEas6ZTiwRYkYwSmOlHoWBufJt6vlouJatDfDYaKJLA4QK1dCkxTCwqZ9UiyiD LrkUoMR Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 20 Jan 2017 11:25:48 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The script "checkpatch.pl" pointed information out like the following. Comparison to NULL could be written … Thus fix affected source code places. Signed-off-by: Markus Elfring --- arch/powerpc/kvm/book3s_hv.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index cfc7699d05df..3122998f6a32 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -458,7 +458,7 @@ static unsigned long do_h_register_vpa(struct kvm_vcpu *vcpu, /* convert logical addr to kernel addr and read length */ va = kvmppc_pin_guest_page(kvm, vpa, &nb); - if (va == NULL) + if (!va) return H_PARAMETER; if (subfunc == H_VPA_REG_VPA) len = be16_to_cpu(((struct reg_vpa *)va)->length.hword); @@ -1591,8 +1591,7 @@ static struct kvmppc_vcore *kvmppc_vcore_create(struct kvm *kvm, int core) struct kvmppc_vcore *vcore; vcore = kzalloc(sizeof(struct kvmppc_vcore), GFP_KERNEL); - - if (vcore == NULL) + if (!vcore) return NULL; spin_lock_init(&vcore->lock); @@ -2221,7 +2220,7 @@ static void collect_piggybacks(struct core_info *cip, int target_threads) prepare_threads(pvc); if (!pvc->n_runnable) { list_del_init(&pvc->preempt_list); - if (pvc->runner == NULL) { + if (!pvc->runner) { pvc->vcore_state = VCORE_INACTIVE; kvmppc_core_end_stolen(pvc); } @@ -2287,7 +2286,7 @@ static void post_guest_process(struct kvmppc_vcore *vc, bool is_master) } else { vc->vcore_state = VCORE_INACTIVE; } - if (vc->n_runnable > 0 && vc->runner == NULL) { + if (vc->n_runnable > 0 && !vc->runner) { /* make sure there's a candidate runner awake */ i = -1; vcpu = next_runnable_thread(vc, &i); @@ -2786,7 +2785,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) while (vcpu->arch.state == KVMPPC_VCPU_RUNNABLE && !signal_pending(current)) { - if (vc->vcore_state == VCORE_PREEMPT && vc->runner == NULL) + if (vc->vcore_state == VCORE_PREEMPT && !vc->runner) kvmppc_vcore_end_preempt(vc); if (vc->vcore_state != VCORE_INACTIVE) { @@ -2833,7 +2832,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) vc->vcore_state == VCORE_PIGGYBACK)) kvmppc_wait_for_exec(vc, vcpu, TASK_UNINTERRUPTIBLE); - if (vc->vcore_state == VCORE_PREEMPT && vc->runner == NULL) + if (vc->vcore_state == VCORE_PREEMPT && !vc->runner) kvmppc_vcore_end_preempt(vc); if (vcpu->arch.state == KVMPPC_VCPU_RUNNABLE) { @@ -3203,7 +3202,7 @@ void kvmppc_alloc_host_rm_ops(void) int size; /* Not the first time here ? */ - if (kvmppc_host_rm_ops_hv != NULL) + if (kvmppc_host_rm_ops_hv) return; ops = kzalloc(sizeof(struct kvmppc_host_rm_ops), GFP_KERNEL); @@ -3430,10 +3429,10 @@ static int kvmppc_set_passthru_irq(struct kvm *kvm, int host_irq, int guest_gsi) mutex_lock(&kvm->lock); pimap = kvm->arch.pimap; - if (pimap == NULL) { + if (!pimap) { /* First call, allocate structure to hold IRQ map */ pimap = kvmppc_alloc_pimap(); - if (pimap == NULL) { + if (!pimap) { mutex_unlock(&kvm->lock); return -ENOMEM; } -- 2.11.0