From patchwork Wed Mar 10 10:38:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 47233 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 9F1BEB7CF3 for ; Wed, 10 Mar 2010 22:08:20 +1100 (EST) Received: from localhost ([127.0.0.1]:45321 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpJlw-0000M4-Oj for incoming@patchwork.ozlabs.org; Wed, 10 Mar 2010 06:08:16 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NpJJk-0008Fv-IR for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:08 -0500 Received: from [199.232.76.173] (port=52771 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NpJJi-0008Db-7l for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:06 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NpJJh-0004tC-9U for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:05 -0500 Received: from mail-ew0-f225.google.com ([209.85.219.225]:37628) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NpJJg-0004sE-N3 for qemu-devel@nongnu.org; Wed, 10 Mar 2010 05:39:04 -0500 Received: by mail-ew0-f225.google.com with SMTP id 25so153290ewy.16 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=hItUvtNm2HtE2vVQIFGZnwcf2yAo8md5D9O+qs/ZB2Q=; b=pqYmtcPOr61FTpgQ7taNCRAEyKIfdH5aJOcXbSnj04Tus1CZAzsCX0Fw9udUTFFUNN dNwlkII1+Js56EEfFlBF+99UydK/9GP6C24PA9Yhfz3xYZbqNkihqWKYozt7giFdm8ml I4f4F8xQYwzCTvMZv81+T8VtViC7pnmYyroOU= 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=jjsJL6uI1/PE1K5IkdKTDVNcywhQKw3NBOjWg3d2oo74LY7Ztt7cEONdXlJWaV7jQ4 YYJH3VqrqJoZSGq0HIOHOslxj1pZS8J0Op5K6ktYvoleYFnazgkcGUCE/T38IBhn6Zq/ +nQU0ePCS0gHr2coZEZw3jVX+CpInDj8N9NuM= Received: by 10.213.96.221 with SMTP id i29mr724714ebn.99.1268217544258; 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.03 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 10 Mar 2010 02:39:03 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 10 Mar 2010 11:38:42 +0100 Message-Id: <1268217535-26554-6-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 05/18] do not use qemu_event_increment outside 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 qemu_notify_event in the non-iothread case is only stopping the current CPU. However, if the CPU is idle and the main loop is in the select call then a call to qemu_event_increment is needed too (as done in host_alarm_handler). Since in general one doesn't know whether the CPU is executing or not, it is a safe bet to always do qemu_event_increment. Another way to see it: after this patch qemu_event_increment is the "common part" of qemu_notify_event for both the CONFIG_IOTHREAD and !CONFIG_IOTHREAD cases, which makes sense. Signed-off-by: Paolo Bonzini --- vl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/vl.c b/vl.c index 6acf702..a546d85 100644 --- a/vl.c +++ b/vl.c @@ -1053,7 +1053,7 @@ static void host_alarm_handler(int host_signum) qemu_get_clock(rt_clock)) || qemu_timer_expired(active_timers[QEMU_CLOCK_HOST], qemu_get_clock(host_clock))) { - qemu_event_increment(); + t->expired = alarm_has_dynticks(t); #ifndef CONFIG_IOTHREAD @@ -3361,6 +3361,7 @@ void qemu_notify_event(void) { CPUState *env = cpu_single_env; + qemu_event_increment (); if (env) { cpu_exit(env); }