Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
From:   Thomas Huth <thuth@redhat.com>
To:     kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>
Cc:     linux-kernel@vger.kernel.org
Subject: [PATCH] KVM: Adjust the return type of kvm_vm_ioctl_check_extension_generic()
Date:   Tue, 31 May 2022 09:55:40 +0200
Message-Id: <20220531075540.14242-1-thuth@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

kvm_vm_ioctl_check_extension_generic() either returns small constant
numbers or the result of kvm_vm_ioctl_check_extension() which is of type
"int". Looking at the callers of kvm_vm_ioctl_check_extension_generic(),
one stores the result in "int r", the other one in "long r", so the
result has to fit in the smaller "int" in any case. Thus let's adjust
the return value to "int" here so we have one less transition from
"int" -> "long" -> "int" in case of the kvm_vm_ioctl() ->
kvm_vm_ioctl_check_extension_generic() -> kvm_vm_ioctl_check_extension()
call chain.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 This patch is of very low importance - if you don't like it, please just
 ignore. I just came across this nit while looking through the code and
 thought that it might be somewhat nicer this way.

 virt/kvm/kvm_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 64ec2222a196..e911331fc620 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -4309,7 +4309,7 @@ static int kvm_ioctl_create_device(struct kvm *kvm,
 	return 0;
 }
 
-static long kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg)
+static int kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg)
 {
 	switch (arg) {
 	case KVM_CAP_USER_MEMORY:
-- 
2.31.1