From patchwork Tue Mar 15 21:50:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 87116 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 DC488B70F3 for ; Wed, 16 Mar 2011 09:45:34 +1100 (EST) Received: from localhost ([127.0.0.1]:55121 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pzczb-0002t0-H7 for incoming@patchwork.ozlabs.org; Tue, 15 Mar 2011 18:45:31 -0400 Received: from [140.186.70.92] (port=35252 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzcLY-0002ND-Sy for qemu-devel@nongnu.org; Tue, 15 Mar 2011 18:04:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PzcLV-0004yk-7t for qemu-devel@nongnu.org; Tue, 15 Mar 2011 18:04:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49377) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PzcLU-0004yJ-H2 for qemu-devel@nongnu.org; Tue, 15 Mar 2011 18:04:04 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2FM43XA017931 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 15 Mar 2011 18:04:03 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p2FM437L009081; Tue, 15 Mar 2011 18:04:03 -0400 Received: from amt.cnet (vpn1-5-191.ams2.redhat.com [10.36.5.191]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id p2FM412l024398; Tue, 15 Mar 2011 18:04:02 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id E0F0068A039; Tue, 15 Mar 2011 18:53:20 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.4/8.14.4/Submit) id p2FLrHB2002173; Tue, 15 Mar 2011 18:53:17 -0300 From: Marcelo Tosatti To: Anthony Liguori Date: Tue, 15 Mar 2011 18:50:44 -0300 Message-Id: <501868d070cab7dcf51bf3367373cfa95f810d88.1300225848.git.mtosatti@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Jan Kiszka , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 30/35] 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 From: Jan Kiszka Test for general errors first as this is the slower path. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti --- kvm-all.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index be235ec..8531555 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(); }