From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Tue, 15 Mar 2011 11:26:26 +0000 (+0100)
Subject: kvm: Reorder error handling of KVM_RUN
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=dc77d341d2dcd3eeadae736ed7e7775e22324844;p=qemu.git

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>
---

diff --git a/kvm-all.c b/kvm-all.c
index be235ec29b..85315551b4 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();
         }