aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2011-03-15 12:26:25 +0100
committerMarcelo Tosatti <mtosatti@redhat.com>2011-03-16 17:11:06 -0300
commit7cbb533f92f040ab1dbafe2233a51c7d4e321d90 (patch)
tree56d37235c077db60b8edc3c9929ca5e4a3a1c3ba
parent51e8fa606e3cbef9cdf5c84f2468dcf1e07ddb70 (diff)
downloadqemu-7cbb533f92f040ab1dbafe2233a51c7d4e321d90.zip
qemu-7cbb533f92f040ab1dbafe2233a51c7d4e321d90.tar.gz
qemu-7cbb533f92f040ab1dbafe2233a51c7d4e321d90.tar.bz2
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>
-rw-r--r--kvm-all.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/kvm-all.c b/kvm-all.c
index 906521e..be235ec 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -890,7 +890,7 @@ void kvm_cpu_synchronize_post_init(CPUState *env)
int kvm_cpu_exec(CPUState *env)
{
struct kvm_run *run = env->kvm_run;
- int ret;
+ int ret, run_ret;
DPRINTF("kvm_cpu_exec()\n");
@@ -920,7 +920,7 @@ int kvm_cpu_exec(CPUState *env)
cpu_single_env = NULL;
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();
cpu_single_env = env;
@@ -928,14 +928,14 @@ int kvm_cpu_exec(CPUState *env)
kvm_flush_coalesced_mmio_buffer();
- if (ret == -EINTR || ret == -EAGAIN) {
+ if (run_ret == -EINTR || run_ret == -EAGAIN) {
DPRINTF("io window exit\n");
ret = 0;
break;
}
- if (ret < 0) {
- DPRINTF("kvm run failed %s\n", strerror(-ret));
+ if (run_ret < 0) {
+ DPRINTF("kvm run failed %s\n", strerror(-run_ret));
abort();
}