From patchwork Fri Jan 20 18:23:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 717873 X-Patchwork-Delegate: paulus@samba.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3v4q1G1gksz9s2G for ; Sat, 21 Jan 2017 05:26:58 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3v4q1G0pHZzDr73 for ; Sat, 21 Jan 2017 05:26:58 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mout.web.de (mout.web.de [212.227.15.4]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3v4pzy3GRNzDqWX for ; Sat, 21 Jan 2017 05:25:50 +1100 (AEDT) Received: from [192.168.1.2] ([77.182.231.71]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MORtt-1caOUG1htV-005rub; Fri, 20 Jan 2017 19:24:01 +0100 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: 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: X-Provags-ID: V03:K0:990vjp2VtRDPkYiJu9+QYVzc30GhZ+JdDnAgEL1kGHMSXQghvjL X1NknchHN8L30VA2orNpjkIPwrjTmbmgEAEdWR5mqmQTYkashxcj/skQmnxkTg4OaIyItSp iGpYCGDt72ozRzTli2ITaeo63xqipp81Dy7AjWw1dMax8NMTfxhbHuJfrVd3/DULrAyezfv XpTdRqCjoIom+EvC+DQPw== X-UI-Out-Filterresults: notjunk:1; V01:K0:Ge+gh4TwnRY=:IKhRsu+8+/auzxpxL+l1uk IVFzc0jk9Yoft3YmxrVNDZf2PuZJ8d9Z0Cz2XWJ0SHXXqqSAyqi4PliC8JnIq2Cb9tPgW1Y9b 2SIJKwqmv9NckWWfP1KZcIOR5To7Tto+TUdZW1jFhOgE7loShKEXA50w3cHkUGMFr6rbe1XHm BIbQcO/r+L49pXJBnIC15IkxTaA0byS/IId0BPt5U4VSSS4YTijaO4WdSxnP0CyeKeBJt84Oe IfHoakF5uHuFlCU7/J/a6NOmPKC2rRkIQ5Fs0QEe8xfMHUZ43wGaWdIqGeb9E9E90Zdk4cwEe A9imL1IjwW1siB8e54eMWgj9TX13kZAL26p6T+X0zcCHYD9n+ex4AJxdoo2Ahi/ZhwJn9grvg tJjIbkmJLlzvJSulHspQiC5Z4aBnV4djwzG+WATg7JqesYUcFZuiL+dlNurrdzAzUFtH2A0FM TrILEzV3imQQ8QMW/lTEXMBZ6C1LbVkAiqqhWZI7cHC6NGi1x22c7I9bNx5eQroou5NI2dAxU tAV4H24Y1qcdNZpdBoiepgoXDbDsA+cyjWxoTjaN0o8mtjIFmDZeA4RRCIcEUIBKOUebmCbnD pRfkn1H2jUwgnUq19+L0Bd8Q5WYki7RczhEYVAf9xeZZEH3fb7XTsQ6Qyjf/OG4iMCBmup+V0 g1CiN3qs+9u64/Zdh9un2J7tGYVdCvIBNmpE0wnqXJPsRPKP8zfFJCyZj0NgZhXw5yzcm1Iqe dOO97px/ZNHkmqqSfBbcs/Uv8HFHG//hR9Edy+Q7mgKSa88rcTVWYq/Emn6+cLOkJ45192Y6b b/dG2fm X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, LKML Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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; }