From patchwork Sun Jan 22 18:17:22 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: 9531321 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 465A76020B for ; Sun, 22 Jan 2017 18:17:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3822D200DF for ; Sun, 22 Jan 2017 18:17:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C10827FAC; Sun, 22 Jan 2017 18:17:48 +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 D3BF3200DF for ; Sun, 22 Jan 2017 18:17:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751785AbdAVSRd (ORCPT ); Sun, 22 Jan 2017 13:17:33 -0500 Received: from mout.web.de ([212.227.15.3]:55499 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751649AbdAVSRa (ORCPT ); Sun, 22 Jan 2017 13:17:30 -0500 Received: from [192.168.1.2] ([78.48.136.24]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0M5x4z-1cKQSQ2sjh-00xon4; Sun, 22 Jan 2017 19:17:23 +0100 Subject: [PATCH 7/9] KVM: Return an error code only as a constant in kvm_get_dirty_log() 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:17:22 +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:JkBMFcdaSNAXimcD7h4Ou+oAFHZPgjLKmyYhwMvhoXGWVq5stxe cCTm2zUiDl/1HVRhh7SVAPBZNcQiYajopVRo/c+ZxCl0QFgkB2C0Km293WEjZBYrjhHavLC BVNip6seSRhyOfvBa+7MsVzq6aH2SnD8W0AeaVMyUM8+3ZwHK40h1inaWOPiXJbfOBd85d0 bCGLMolVvA19u9TVRs5iQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:2/Q09pZae9A=:+KgYiE5+MmHx6H3C7CZBQK SJ/Eo+gRyWyAnWmkPo/2sV9DbCUfMoqRG+nfN7nIz2nG2MncZNCtKwwwWk/VE78Df0hifKFqD phK+XVZR2CMmF9rQaoxYL12CDXu07EQZNYfa+uxzDLPWjbLWtSErXhuzWd+ZyPnqcsoTPZJfV kAhgNjLmOP/xj4NDIp2A17G+zIicV8/Nd9rpIKuMF3IOD9GHckKtE7+ZhPbuW+pciDG27RRzY Vxvi0HAMVwZ6+n6BsXOjKZZiXoTYmAVl7Yro1NRZpWzdhxIxeldUBCCDJQQZNrz/HMobBkBYI UX3OxdLn/LwqD9c9A4qp3nJYQQzfcEKb8CBeDcnaipaIWZhYHlc6dMI8gVpWNYQE9Feb3v0Gf +8xGTesxOBBQcarZU8Ci7j1K04tCbXOHWFsIbnwRCxdVIRQRHfDXDiaJm5G2VXsHk2ezDVXCT JfG5vJs2Ib/pcxxfgZSWR4jlPORic7e0aAleqk0qB/Rm810VHs/HoDIOLTnJP56GiAF00uJkH MrO9UUOUfjunC/cDWPbCk/2rLurLGjyPdt8279Zc39L6PE3/c0Fwq3USUtJuKrHQIHTIx09hQ pAPtT4fSLNi5FF8u3H+nC1RAMoU1o+ljyfjrdKO492TYTO/pjY8F2SEpRHJMcS42Mby70XbWc BRcsE3enbX/jgizA90qixsRzN7gFJ8k/Q64Eg0rx25zMEXSgkurDPq6i8DOleMTD9Kjz2QFBC SpedM9AJ2EkI5FlZOFLxuy25pk8es+WjmgYcO6FVkKnzN+8OIa+2tCHn0mxDZ58+2DQKFmRiF L0E5Pju 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:41:07 +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 | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index a651a137ef21..ca88f3620ee3 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1094,37 +1094,31 @@ int kvm_get_dirty_log(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 any = 0; - 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); - r = -ENOENT; if (!memslot->dirty_bitmap) - goto out; + return -ENOENT; n = kvm_dirty_bitmap_bytes(memslot); for (i = 0; !any && i < n/sizeof(long); ++i) any = memslot->dirty_bitmap[i]; - r = -EFAULT; if (copy_to_user(log->dirty_bitmap, memslot->dirty_bitmap, n)) - goto out; + return -EFAULT; if (any) *is_dirty = 1; - - r = 0; -out: - return r; + return 0; } EXPORT_SYMBOL_GPL(kvm_get_dirty_log);