From patchwork Tue Mar 15 11:26:26 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Kiszka <jan.kiszka@siemens.com>
X-Patchwork-Id: 635881
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2FBRCfE018000
	for <patchwork-kvm@patchwork.kernel.org>;
	Tue, 15 Mar 2011 11:27:12 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757401Ab1COL1D (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Tue, 15 Mar 2011 07:27:03 -0400
Received: from goliath.siemens.de ([192.35.17.28]:33298 "EHLO
	goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1757299Ab1COL0v (ORCPT <rfc822; kvm@vger.kernel.org>);
	Tue, 15 Mar 2011 07:26:51 -0400
Received: from mail1.siemens.de (localhost [127.0.0.1])
	by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p2FBQcVP008219;
	Tue, 15 Mar 2011 12:26:38 +0100
Received: from mchn199C.mchp.siemens.de ([146.254.215.103])
	by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p2FBQVg9000888;
	Tue, 15 Mar 2011 12:26:38 +0100
From: Jan Kiszka <jan.kiszka@siemens.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org
Subject: [PATCH v2 15/20] kvm: Reorder error handling of KVM_RUN
Date: Tue, 15 Mar 2011 12:26:26 +0100
Message-Id: 
 <dfdb61c50ad1d45c4aebe28447ea4e8ed998060f.1300188374.git.jan.kiszka@siemens.com>
X-Mailer: git-send-email 1.7.1
In-Reply-To: <cover.1300188374.git.jan.kiszka@siemens.com>
References: <cover.1300188374.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1300188374.git.jan.kiszka@siemens.com>
References: <cover.1300188374.git.jan.kiszka@siemens.com>
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Tue, 15 Mar 2011 11:27:12 +0000 (UTC)


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();
         }