From: linmiaohe <linmiaohe@huawei.com>
To: <pbonzini@redhat.com>, <rkrcmar@redhat.com>,
<sean.j.christopherson@intel.com>, <vkuznets@redhat.com>,
<wanpengli@tencent.com>, <jmattson@google.com>, <joro@8bytes.org>,
<tglx@linutronix.de>, <mingo@redhat.com>, <bp@alien8.de>,
<hpa@zytor.com>
Cc: <linmiaohe@huawei.com>, <kvm@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <x86@kernel.org>
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 [thread overview]
Message-ID: <1575710723-32094-7-git-send-email-linmiaohe@huawei.com> (raw)
In-Reply-To: <1575710723-32094-1-git-send-email-linmiaohe@huawei.com>
From: Miaohe Lin <linmiaohe@huawei.com>
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 <linmiaohe@huawei.com>
---
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:
--
2.19.1
prev parent reply other threads:[~2019-12-07 9:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-07 9:25 [PATCH 0/6] remove unnecessary return val of kvm pit linmiaohe
2019-12-07 9:25 ` [PATCH 1/6] KVM: x86: remove always equal to 0 return val of kvm_vm_ioctl_get_pit() linmiaohe
2019-12-07 9:25 ` [PATCH 2/6] KVM: x86: remove always equal to 0 return val of kvm_vm_ioctl_set_pit() linmiaohe
2019-12-07 9:25 ` [PATCH 3/6] KVM: x86: remove always equal to 0 return val of kvm_vm_ioctl_get_pit2() linmiaohe
2019-12-07 9:25 ` [PATCH 4/6] KVM: x86: remove always equal to 0 return val of kvm_vm_ioctl_set_pit2() linmiaohe
2019-12-07 9:25 ` [PATCH 5/6] KVM: x86: check kvm_pit outside kvm_vm_ioctl_reinject() linmiaohe
2020-01-15 17:53 ` Paolo Bonzini
2019-12-07 9:25 ` linmiaohe [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1575710723-32094-7-git-send-email-linmiaohe@huawei.com \
--to=linmiaohe@huawei.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
--cc=sean.j.christopherson@intel.com \
--cc=tglx@linutronix.de \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).