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 X-Patchwork-Id: 86958 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3C422B700F for ; Tue, 15 Mar 2011 22:43:10 +1100 (EST) Received: from localhost ([127.0.0.1]:43750 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzSeY-0001LH-Tl for incoming@patchwork.ozlabs.org; Tue, 15 Mar 2011 07:43:06 -0400 Received: from [140.186.70.92] (port=35188 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzSOi-000134-2m for qemu-devel@nongnu.org; Tue, 15 Mar 2011 07:26:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PzSOd-0004Ce-Tz for qemu-devel@nongnu.org; Tue, 15 Mar 2011 07:26:43 -0400 Received: from goliath.siemens.de ([192.35.17.28]:21988) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PzSOd-0004Bw-J9 for qemu-devel@nongnu.org; Tue, 15 Mar 2011 07:26:39 -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 To: Avi Kivity , Marcelo Tosatti Date: Tue, 15 Mar 2011 12:26:26 +0100 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.28 Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH v2 15/20] kvm: Reorder error handling of KVM_RUN X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Test for general errors first as this is the slower path. Signed-off-by: Jan Kiszka --- kvm-all.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) 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(); }