ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kvm: Keep KVM_RUN return value in separate variable 

Avoid using 'ret' both for the return value of KVM_RUN as well as the
code kvm_cpu_exec is supposed to return. Both have no direct relation.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Jan Kiszka 2011-03-15 12:26:25 +01:00 committed by Marcelo Tosatti
parent 51e8fa606e
commit 7cbb533f92
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kvm-all.c
View File

@ -890,7 +890,7 @@ void kvm_cpu_synchronize_post_init(CPUState *env)
int kvm_cpu_exec(CPUState *env) int kvm_cpu_exec(CPUState *env)
{ {
struct kvm_run *run = env->kvm_run; struct kvm_run *run = env->kvm_run;
int ret; int ret, run_ret;
DPRINTF("kvm_cpu_exec()\n"); DPRINTF("kvm_cpu_exec()\n");
@ -920,7 +920,7 @@ int kvm_cpu_exec(CPUState *env)
cpu_single_env = NULL; cpu_single_env = NULL;
qemu_mutex_unlock_iothread(); qemu_mutex_unlock_iothread();
ret = kvm_vcpu_ioctl(env, KVM_RUN, 0); run_ret = kvm_vcpu_ioctl(env, KVM_RUN, 0);
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();
cpu_single_env = env; cpu_single_env = env;
@ -928,14 +928,14 @@ int kvm_cpu_exec(CPUState *env)
kvm_flush_coalesced_mmio_buffer(); kvm_flush_coalesced_mmio_buffer();
if (ret == -EINTR || ret == -EAGAIN) { if (run_ret == -EINTR || run_ret == -EAGAIN) {
DPRINTF("io window exit\n"); DPRINTF("io window exit\n");
ret = 0; ret = 0;
break; break;
} }
if (ret < 0) { if (run_ret < 0) {
DPRINTF("kvm run failed %s\n", strerror(-ret)); DPRINTF("kvm run failed %s\n", strerror(-run_ret));
abort(); abort();
} }