From patchwork Wed Mar 10 10:38:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 47236 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 B9F43B7CF9 for ; Wed, 10 Mar 2010 22:18:21 +1100 (EST) Received: from localhost ([127.0.0.1]:40140 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpJve-0003Bz-EE for incoming@patchwork.ozlabs.org; Wed, 10 Mar 2010 06:18:18 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NpJJo-0008IO-Fy for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:13 -0500 Received: from [199.232.76.173] (port=52779 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpJJk-0008GM-Uq for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:09 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NpJJi-0004tY-EK for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:08 -0500 Received: from ey-out-1920.google.com ([74.125.78.148]:44402) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NpJJi-0004t4-1y for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:06 -0500 Received: by ey-out-1920.google.com with SMTP id 5so4373200eyb.14 for ; Wed, 10 Mar 2010 02:39:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:subject:date :message-id:x-mailer:in-reply-to:references; bh=N+BmuywUDI9F1k0H0IXITal2o8bEoko7tL35yVtp7Ro=; b=HZwOmqhpdSYVVjv0Uki4JpW0B6v0JhswGCd7PCBD7yztuvmllDTUMxnz1vGJ8naEcm zBcZ0i/rm5gtDaJeOeHcec9cKu0fbkJ0xiEpjZliGIl0rcanCKt9s/4ghnRJDTqWd3FB khRQQVcMqg8jHtzwK+P7vmSUiS4wGb3Ordkt0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=olW1MADkN5Mq9eBQ+5gOhCAqTXmZW5DmI4sMLPQYBRW6jdpR9OHafB3q9l5WuNMH0t ma92Yu/uzOg+RiIoANHbiab61qURlCSNbbIHlPBaCQjQTCY5kTLYh/7AXwdenQ+9XY8z 3w0IIlXz4zjGwpSNyP47KM2SB+4MiA2cPcB/M= Received: by 10.213.97.28 with SMTP id j28mr4984801ebn.82.1268217544836; Wed, 10 Mar 2010 02:39:04 -0800 (PST) Received: from localhost.localdomain (nat-pool-brq-t.redhat.com [209.132.186.34]) by mx.google.com with ESMTPS id 14sm3836002ewy.2.2010.03.10.02.39.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 10 Mar 2010 02:39:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 10 Mar 2010 11:38:43 +0100 Message-Id: <1268217535-26554-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1268217535-26554-1-git-send-email-pbonzini@redhat.com> References: <1268217535-26554-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 06/18] 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 a546d85..1328979 100644 --- a/vl.c +++ b/vl.c @@ -1055,13 +1055,6 @@ static void host_alarm_handler(int host_signum) qemu_get_clock(host_clock))) { 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 t->pending = 1; qemu_notify_event(); } @@ -3365,6 +3358,9 @@ void qemu_notify_event(void) if (env) { cpu_exit(env); } + if (next_cpu && env != next_cpu) { + cpu_exit(next_cpu); + } } void qemu_mutex_lock_iothread(void) {}