Re: [PATCH] selftests: kvm: replace ternary operator with min()

On Wed, May 11, 2022 at 5:38 PM Guo Zhengkui guozhengkui@vivo.com wrote:

Fix the following coccicheck warnings:

tools/testing/selftests/kvm/lib/s390x/ucall.c:25:15-17: WARNING opportunity for min() tools/testing/selftests/kvm/lib/x86_64/ucall.c:27:15-17: WARNING opportunity for min() tools/testing/selftests/kvm/lib/riscv/ucall.c:56:15-17: WARNING opportunity for min() tools/testing/selftests/kvm/lib/aarch64/ucall.c:82:15-17: WARNING opportunity for min() tools/testing/selftests/kvm/lib/aarch64/ucall.c:55:20-21: WARNING opportunity for min()

min() is defined in tools/include/linux/kernel.h.

Signed-off-by: Guo Zhengkui guozhengkui@vivo.com

For KVM RISC-V: Acked-by: Anup Patel anup@brainfault.org

Thanks, Anup

---

tools/testing/selftests/kvm/lib/aarch64/ucall.c | 4 ++-- tools/testing/selftests/kvm/lib/riscv/ucall.c | 2 +- tools/testing/selftests/kvm/lib/s390x/ucall.c | 2 +- tools/testing/selftests/kvm/lib/x86_64/ucall.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/kvm/lib/aarch64/ucall.c b/tools/testing/selftests/kvm/lib/aarch64/ucall.c index e0b0164e9af8..00be3ef195ca 100644 --- a/tools/testing/selftests/kvm/lib/aarch64/ucall.c +++ b/tools/testing/selftests/kvm/lib/aarch64/ucall.c @@ -52,7 +52,7 @@ void ucall_init(struct kvm_vm *vm, void *arg) * lower and won't match physical addresses. */ bits = vm->va_bits - 1;

•   bits = vm->pa_bits < bits ? vm->pa_bits : bits;
  

•   bits = min(vm->pa_bits, bits);
    end = 1ul << bits;
    start = end * 5 / 8;
    step = end / 16;
  

@@ -79,7 +79,7 @@ void ucall(uint64_t cmd, int nargs, ...) va_list va; int i;

•   nargs = nargs <= UCALL_MAX_ARGS ? nargs : UCALL_MAX_ARGS;
  

•   nargs = min(nargs, UCALL_MAX_ARGS);
  
    va_start(va, nargs);
    for (i = 0; i < nargs; ++i)
  

diff --git a/tools/testing/selftests/kvm/lib/riscv/ucall.c b/tools/testing/selftests/kvm/lib/riscv/ucall.c index 9e42d8248fa6..34f16fe70ce8 100644 --- a/tools/testing/selftests/kvm/lib/riscv/ucall.c +++ b/tools/testing/selftests/kvm/lib/riscv/ucall.c @@ -53,7 +53,7 @@ void ucall(uint64_t cmd, int nargs, ...) va_list va; int i;

•   nargs = nargs <= UCALL_MAX_ARGS ? nargs : UCALL_MAX_ARGS;
  

•   nargs = min(nargs, UCALL_MAX_ARGS);
  
    va_start(va, nargs);
    for (i = 0; i < nargs; ++i)
  

diff --git a/tools/testing/selftests/kvm/lib/s390x/ucall.c b/tools/testing/selftests/kvm/lib/s390x/ucall.c index 9d3b0f15249a..665267c1135d 100644 --- a/tools/testing/selftests/kvm/lib/s390x/ucall.c +++ b/tools/testing/selftests/kvm/lib/s390x/ucall.c @@ -22,7 +22,7 @@ void ucall(uint64_t cmd, int nargs, ...) va_list va; int i;

•   nargs = nargs <= UCALL_MAX_ARGS ? nargs : UCALL_MAX_ARGS;
  

•   nargs = min(nargs, UCALL_MAX_ARGS);
  
    va_start(va, nargs);
    for (i = 0; i < nargs; ++i)
  

diff --git a/tools/testing/selftests/kvm/lib/x86_64/ucall.c b/tools/testing/selftests/kvm/lib/x86_64/ucall.c index a3489973e290..2ea31a0ebe30 100644 --- a/tools/testing/selftests/kvm/lib/x86_64/ucall.c +++ b/tools/testing/selftests/kvm/lib/x86_64/ucall.c @@ -24,7 +24,7 @@ void ucall(uint64_t cmd, int nargs, ...) va_list va; int i;

•   nargs = nargs <= UCALL_MAX_ARGS ? nargs : UCALL_MAX_ARGS;
  

•   nargs = min(nargs, UCALL_MAX_ARGS);
  
    va_start(va, nargs);
    for (i = 0; i < nargs; ++i)
  

-- 2.20.1