@r is used for 2 distinct concepts: - kvm_init_vcpu() returns an errno. However we don't consume it, besides it is called with &error_fatal. Drop the unused returned value.
- kvm_cpu_exec() returns an exception code. Reduce the variable scope and rename @r as @excp to clarify. Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- accel/kvm/kvm-accel-ops.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/accel/kvm/kvm-accel-ops.c b/accel/kvm/kvm-accel-ops.c index 73ff93aab67..06f56773324 100644 --- a/accel/kvm/kvm-accel-ops.c +++ b/accel/kvm/kvm-accel-ops.c @@ -31,7 +31,6 @@ static void *kvm_vcpu_thread_fn(void *arg) { CPUState *cpu = arg; - int r; rcu_register_thread(); @@ -40,7 +39,7 @@ static void *kvm_vcpu_thread_fn(void *arg) cpu->thread_id = qemu_get_thread_id(); current_cpu = cpu; - r = kvm_init_vcpu(cpu, &error_fatal); + kvm_init_vcpu(cpu, &error_fatal); kvm_init_cpu_signals(cpu); /* signal CPU creation */ @@ -52,8 +51,10 @@ static void *kvm_vcpu_thread_fn(void *arg) qemu_process_cpu_events(cpu); if (cpu_can_run(cpu)) { - r = kvm_cpu_exec(cpu); - if (r == EXCP_DEBUG) { + int excp; + + excp = kvm_cpu_exec(cpu); + if (excp == EXCP_DEBUG) { cpu_handle_guest_debug(cpu); } } -- 2.53.0
