From patchwork Sun Jan 22 18:16:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9531311 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C25036049F for ; Sun, 22 Jan 2017 18:16:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B51F5200DF for ; Sun, 22 Jan 2017 18:16:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA41627FB1; Sun, 22 Jan 2017 18:16:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5821927FAC for ; Sun, 22 Jan 2017 18:16:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751646AbdAVSQ0 (ORCPT ); Sun, 22 Jan 2017 13:16:26 -0500 Received: from mout.web.de ([212.227.15.14]:49622 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751580AbdAVSQY (ORCPT ); Sun, 22 Jan 2017 13:16:24 -0500 Received: from [192.168.1.2] ([78.48.136.24]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MSIwN-1cygyB1puN-00TTx9; Sun, 22 Jan 2017 19:16:17 +0100 Subject: [PATCH 6/9] KVM: Return an error code only as a constant in kvm_get_dirty_log_protect() 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: <2f83abd2-cf68-4294-6603-cfab2991e731@users.sourceforge.net> Date: Sun, 22 Jan 2017 19:16:14 +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:ALFDZNNaMoR0VxIhYnty5BqgprMlTdWDuqlK/Cj7l9122Nu4xGI 6Ed499+gc9SsupT8a3GzDs8gbMbOMqrMypdkZlYiixQOtVTmCgB5RZAviwhwmTTGx+7BzDN R/NdSVi+FXZRPAH54/yOxiBJMdu0iiGcpIakE73p/+lbxYfoArRi9yHoK9kHmH90+H7/8Jm /ZMvA4RS40JWd3tEblcMQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:OQNs/YXmjKg=:yDd9wO+cNhe4wWZezXF0ou 4xHfbyGLQB09EMR2y1eA15ryjk3bhldDZCD5ffovnurrlx4LwZtlEAazxupc9oSpJgmPPbvxP +gEDb8ukDgVJlTXs68wIZ4ZKnMnPjJV701yzlEAJXr1kAcgmzWLfpIWdFrnBlwCok4T3H9aXZ wHuPAih1Mad5qNXQLNLyFc15AUDrHsqWRG9WfAOGpvBYjftkX4acEb2YsxIFk5r68wqwlePSW 8ON3D1u1vN6bd+AJxK7tuBNJR/2Wo6j5oC9TObdwjaej9ZLmGxxfng9qal9+rcsRWhFbdR/r0 oUUyMXpp8gO5T5fYux7rQH1NMVV75MZr4q9AuD/gLR5F9EOJeGY2VfUbajoFp+kN1Y7fNOMVW sLJ6ryZ1yn+EHS8+a5IL3tpt6n5v3zpvJQMZvY/UqHSxVYNN+cOyWQhC7QjS1OOndRPK66Pio Qvjo5KccrLsfLxlWl5VOYKvWu1ErcYTd74Ahxq2YDHaggbPXZHloSiEmK7XCJx3sf8pchMKl6 qmXxbBAhxr2XpgOf66b8qE71rNb82IrLz/1qVN4H8S5pZqykHVToM4JPgFN2ss265hHyN9CpH vVPs2wkH0DSdSDe31/FJx9UUrXtgjvYW/611A5C7TOFmceAjaQz5VJ+InHHA4noKVuNDMTVeC geRo59f/7gdMEKV3inG90SLuW2hG/Pft9w9bfVucbSoAaoPUizG+f8VCR6RkYXM2b5Hx0zjz7 fUFw+NlP0O/M0q/e741Nhhg2uo32XD7WZTiaYojL6ObUNPXmMImhzShmpe3nxrjysi+RkO+5p iW9nD6O Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Sun, 22 Jan 2017 17:30:16 +0100 * Return an error code without storing it in an intermediate variable. * Delete the local variable "r" and the jump label "out" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- virt/kvm/kvm_main.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 6a74a3796b3f..a651a137ef21 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1156,24 +1156,22 @@ int kvm_get_dirty_log_protect(struct kvm *kvm, { struct kvm_memslots *slots; struct kvm_memory_slot *memslot; - int r, i, as_id, id; + int i, as_id, id; unsigned long n; unsigned long *dirty_bitmap; unsigned long *dirty_bitmap_buffer; - r = -EINVAL; as_id = log->slot >> 16; id = (u16)log->slot; if (as_id >= KVM_ADDRESS_SPACE_NUM || id >= KVM_USER_MEM_SLOTS) - goto out; + return -EINVAL; slots = __kvm_memslots(kvm, as_id); memslot = id_to_memslot(slots, id); dirty_bitmap = memslot->dirty_bitmap; - r = -ENOENT; if (!dirty_bitmap) - goto out; + return -ENOENT; n = kvm_dirty_bitmap_bytes(memslot); @@ -1202,14 +1200,9 @@ int kvm_get_dirty_log_protect(struct kvm *kvm, } spin_unlock(&kvm->mmu_lock); - - r = -EFAULT; if (copy_to_user(log->dirty_bitmap, dirty_bitmap_buffer, n)) - goto out; - - r = 0; -out: - return r; + return -EFAULT; + return 0; } EXPORT_SYMBOL_GPL(kvm_get_dirty_log_protect); #endif