From patchwork Mon Dec 21 08:09:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 41532 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 4CC58B6F0C for ; Mon, 21 Dec 2009 20:01:08 +1100 (EST) Received: from localhost ([127.0.0.1]:57763 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NMe8X-0007be-FA for incoming@patchwork.ozlabs.org; Mon, 21 Dec 2009 04:01:05 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NMdL2-0002pK-BC for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:56 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NMdKu-0002ki-Ce for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:52 -0500 Received: from [199.232.76.173] (port=52825 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NMdKu-0002kX-43 for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:7286) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NMdKt-0003pD-KC for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:47 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBL89luq003662 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 21 Dec 2009 03:09:47 -0500 Received: from localhost.localdomain (vpn2-10-119.ams2.redhat.com [10.36.10.119]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBL89V3a011460 for ; Mon, 21 Dec 2009 03:09:46 -0500 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Dec 2009 09:09:27 +0100 Message-Id: <1261382970-23251-17-git-send-email-pbonzini@redhat.com> In-Reply-To: <1261382970-23251-1-git-send-email-pbonzini@redhat.com> References: <1261382970-23251-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 16/19] tweak qemu_notify_event 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 Instead of testing specially next_cpu in host_alarm_handler, just do that in qemu_notify_event. The idea is, if we are not running (or not yet running) target CPU code, prepare things so that the execution loop is exited asap; just make that clear. Signed-off-by: Paolo Bonzini --- vl.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/vl.c b/vl.c index 11b1b70..23ba687 100644 --- a/vl.c +++ b/vl.c @@ -1095,13 +1095,6 @@ static void host_alarm_handler(int host_signum) qemu_get_clock(host_clock))) { qemu_notify_event(); t->expired = alarm_has_dynticks(t); - -#ifndef CONFIG_IOTHREAD - if (next_cpu) { - /* stop the currently executing cpu because a timer occured */ - cpu_exit(next_cpu); - } -#endif qemu_bh_schedule(t->bh); } } @@ -3719,6 +3712,9 @@ void qemu_notify_event(void) if (env) { cpu_exit(env); + } else if (next_cpu) { + /* stop the currently executing cpu because a timer occured */ + cpu_exit(next_cpu); } }