Patchwork [v2,15/20] kvm: Reorder error handling of KVM_RUN

login
register
mail settings
Submitter Jan Kiszka
Date March 15, 2011, 11:26 a.m.
Message ID <dfdb61c50ad1d45c4aebe28447ea4e8ed998060f.1300188374.git.jan.kiszka@siemens.com>
Download mbox | patch
Permalink /patch/86958/
State New
Headers show

Comments

Jan Kiszka - March 15, 2011, 11:26 a.m.
Test for general errors first as this is the slower path.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kvm-all.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

Patch

diff --git a/kvm-all.c b/kvm-all.c
index 99abe82..59276cd 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -939,13 +939,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();
         }