From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751818AbdAVSSZ (ORCPT ); Sun, 22 Jan 2017 13:18:25 -0500 Received: from mout.web.de ([212.227.15.14]:52177 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751346AbdAVSSR (ORCPT ); Sun, 22 Jan 2017 13:18:17 -0500 Subject: [PATCH 8/9] KVM: Adjust seven checks for null pointers To: kvm@vger.kernel.org, Paolo Bonzini , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= References: Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: Date: Sun, 22 Jan 2017 19:18:10 +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:HSspybowQl3DumFOYKPYL8ph49txXt1sn4e0nPbf3mirIKVdmwP FpFD6h4RTTcYh2nks1i48JCTQEr9Esh0dZZJ5cpkEOtnAr4+HHXu/+eO1KGaIyE1K40mJhy 6rY7LfEMvrivE+s/uzjykQ01x7RTcGXl1Qx66DTfvbbW823Bc1tWTEQrf1pFU+YIUDv/3Rh YwjnchIRhZGuYuhIzIkGA== X-UI-Out-Filterresults: notjunk:1;V01:K0:fq1y+JKtdxc=:xl1cnl8don8Z8QKVtE/WNy rz1cD/PMmi2FS33GzQZ/1yb4peaNaZj26zBqL755Gb+zIOy82woL5QYV0jorncYEcTm0wAiuN +gj7niKLw38UYSrnwBmEe0qiri7KGO/TnfBZKAdeWPTVdivfrXywDrtXyE7IaKzFZEXqhSVa0 mv0JlEJClEAu4tDKGxhMCfVSwdzck5gdPmJcymuzCE1647TUn8LyBRpAafYawM7VCf6Nvhao6 Qo7Zx3xEBHQtsfdlOoZYxLHaqF0W8Vv7nRmtJTgFR301mF4fjbYq4tjiTlhOu/TmF7/a0FWtB sLUQ1AerXYk6pyrLHQ55jUqP8VJHUZ/DjHo67KYzceR76pwK9/TAXS389ZYfKmnZklca2l7pJ qVBzpugPpnY2dx1nqy3kgdpWSuKheo/A9ZFDSYhlyaWj0VERe+ntaECo4LuhkgT+7P5i2CWbP BD5G/SAwK3k4psbtKAAyrIwVfWG5eXh/LgvrpjjGG6jhLt/kotFwWPndtaZtN4e/3SNO2GkVB D713Uy2ILZ4z5J1TpKysgrOjT7aDtEfjIQeDGKBKYWdP/FzUey0vIvgimZH54zskTa4/X2IMf iBDi22a3P3ta5TmpB3vdp/59CRtD1wkqnkcnoJ+1aBsr8qLT0KecWAeBfVwNBZ5oIUF7cZ9ko FGl2JzKPXP6yKGHPpOUnSvMGJIGIqqe3CQ3i5cdZ5UvSTp1SsXrgFGyUVcM7msDSZrwYY3rYP Nhd34A2lfxswdgBSRDMNClgV3AesYaWzPytmlNThy13QXh7B4NcsbZFUq6PLs5K7/IgtRqpjh AQ4u0T1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 22 Jan 2017 18:54:22 +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 --- virt/kvm/kvm_main.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index ca88f3620ee3..4267a2c6f2aa 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -184,7 +184,7 @@ bool kvm_make_all_cpus_request(struct kvm *kvm, unsigned int req) /* Set ->requests bit before we read ->mode. */ smp_mb__after_atomic(); - if (cpus != NULL && cpu != -1 && cpu != me && + if (cpus && cpu != -1 && cpu != me && kvm_vcpu_exiting_guest_mode(vcpu) != OUTSIDE_GUEST_MODE) cpumask_set_cpu(cpu, cpus); } @@ -1532,10 +1532,9 @@ static kvm_pfn_t hva_to_pfn(unsigned long addr, bool atomic, bool *async, retry: vma = find_vma_intersection(current->mm, addr, addr + 1); - - if (vma == NULL) + if (!vma) { pfn = KVM_PFN_ERR_FAULT; - else if (vma->vm_flags & (VM_IO | VM_PFNMAP)) { + } else if (vma->vm_flags & (VM_IO | VM_PFNMAP)) { r = hva_to_pfn_remapped(vma, addr, async, write_fault, &pfn); if (r == -EAGAIN) goto retry; @@ -2835,7 +2834,7 @@ int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type) if (type >= ARRAY_SIZE(kvm_device_ops_table)) return -ENOSPC; - if (kvm_device_ops_table[type] != NULL) + if (kvm_device_ops_table[type]) return -EEXIST; kvm_device_ops_table[type] = ops; @@ -2844,7 +2843,7 @@ int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type) void kvm_unregister_device_ops(u32 type) { - if (kvm_device_ops_table[type] != NULL) + if (kvm_device_ops_table[type]) kvm_device_ops_table[type] = NULL; } @@ -2860,7 +2859,7 @@ static int kvm_ioctl_create_device(struct kvm *kvm, return -ENODEV; ops = kvm_device_ops_table[cd->type]; - if (ops == NULL) + if (!ops) return -ENODEV; if (test) @@ -3392,7 +3391,7 @@ static int kvm_io_bus_get_first_dev(struct kvm_io_bus *bus, range = bsearch(&key, bus->range, bus->dev_count, sizeof(struct kvm_io_range), kvm_io_bus_sort_cmp); - if (range == NULL) + if (!range) return -ENOENT; off = range - bus->range; @@ -3803,7 +3802,7 @@ static int kvm_init_debug(void) struct kvm_stats_debugfs_item *p; kvm_debugfs_dir = debugfs_create_dir("kvm", NULL); - if (kvm_debugfs_dir == NULL) + if (!kvm_debugfs_dir) goto out; kvm_debugfs_num_entries = 0; -- 2.11.0