From patchwork Sat Dec 7 09:25:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaohe Lin X-Patchwork-Id: 11277295 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D075C1805 for ; Sat, 7 Dec 2019 09:26:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF4BB21835 for ; Sat, 7 Dec 2019 09:26:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726528AbfLGJZt (ORCPT ); Sat, 7 Dec 2019 04:25:49 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:59234 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726263AbfLGJZt (ORCPT ); Sat, 7 Dec 2019 04:25:49 -0500 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id F321D2097DBCFEC46ADE; Sat, 7 Dec 2019 17:25:46 +0800 (CST) Received: from huawei.com (10.175.105.18) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.439.0; Sat, 7 Dec 2019 17:25:37 +0800 From: linmiaohe To: , , , , , , , , , , CC: , , , Subject: [PATCH 6/6] KVM: x86: remove always equal to 0 return val of kvm_vm_ioctl_reinject() Date: Sat, 7 Dec 2019 17:25:23 +0800 Message-ID: <1575710723-32094-7-git-send-email-linmiaohe@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1575710723-32094-1-git-send-email-linmiaohe@huawei.com> References: <1575710723-32094-1-git-send-email-linmiaohe@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.105.18] X-CFilter-Loop: Reflected Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Miaohe Lin The return val of kvm_vm_ioctl_reinject() is always equal to 0, which means there is no way to failed with this function. So remove the return val as it's unnecessary to check against it. Signed-off-by: Miaohe Lin --- arch/x86/kvm/x86.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 00b5d4ace383..82b0403cb2c7 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4657,7 +4657,7 @@ static void kvm_vm_ioctl_set_pit2(struct kvm *kvm, struct kvm_pit_state2 *ps) mutex_unlock(&pit->pit_state.lock); } -static int kvm_vm_ioctl_reinject(struct kvm *kvm, +static void kvm_vm_ioctl_reinject(struct kvm *kvm, struct kvm_reinject_control *control) { struct kvm_pit *pit = kvm->arch.vpit; @@ -4669,8 +4669,6 @@ static int kvm_vm_ioctl_reinject(struct kvm *kvm, mutex_lock(&pit->pit_state.lock); kvm_pit_set_reinject(pit, control->pit_reinject); mutex_unlock(&pit->pit_state.lock); - - return 0; } /** @@ -5029,7 +5027,8 @@ long kvm_arch_vm_ioctl(struct file *filp, r = -ENXIO; if (!kvm->arch.vpit) goto out; - r = kvm_vm_ioctl_reinject(kvm, &control); + kvm_vm_ioctl_reinject(kvm, &control); + r = 0; break; } case KVM_SET_BOOT_CPU_ID: