aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2011-03-15 12:26:26 +0100
committerMarcelo Tosatti <mtosatti@redhat.com>2011-03-16 17:11:06 -0300
commitdc77d341d2dcd3eeadae736ed7e7775e22324844 (patch)
treeff913e96be0a29056006276e88d9679bfd0692b9
parent7cbb533f92f040ab1dbafe2233a51c7d4e321d90 (diff)
downloadqemu-dc77d341d2dcd3eeadae736ed7e7775e22324844.zip
qemu-dc77d341d2dcd3eeadae736ed7e7775e22324844.tar.gz
qemu-dc77d341d2dcd3eeadae736ed7e7775e22324844.tar.bz2
kvm: Reorder error handling of KVM_RUN
Test for general errors first as this is the slower path. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--kvm-all.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/kvm-all.c b/kvm-all.c
index be235ec..8531555 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -928,13 +928,12 @@ int kvm_cpu_exec(CPUState *env)
kvm_flush_coalesced_mmio_buffer();
- if (run_ret == -EINTR || run_ret == -EAGAIN) {
- DPRINTF("io window exit\n");
- ret = 0;
- break;
- }
-
if (run_ret < 0) {
+ if (run_ret == -EINTR || run_ret == -EAGAIN) {
+ DPRINTF("io window exit\n");
+ ret = 0;
+ break;
+ }
DPRINTF("kvm run failed %s\n", strerror(-run_ret));
abort();
}