]> git.proxmox.com Git - qemu.git/commitdiff
kvm: Reorder error handling of KVM_RUN
authorJan Kiszka <jan.kiszka@siemens.com>
Tue, 15 Mar 2011 11:26:26 +0000 (12:26 +0100)
committerMarcelo Tosatti <mtosatti@redhat.com>
Wed, 16 Mar 2011 20:11:06 +0000 (17:11 -0300)
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>
kvm-all.c

index be235ec29bcdc3e73ba7a45d6586d6505faa65ef..85315551b4aa9420e4823fb3cc6e288db50cd139 100644 (file)
--- 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();
         }