From patchwork Fri Apr 15 07:49:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 91324 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 88782B6FE0 for ; Fri, 15 Apr 2011 17:50:09 +1000 (EST) Received: from localhost ([::1]:50624 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAdn4-0004Vr-Rb for incoming@patchwork.ozlabs.org; Fri, 15 Apr 2011 03:50:06 -0400 Received: from eggs.gnu.org ([140.186.70.92]:60159) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAdmt-0004VR-V0 for qemu-devel@nongnu.org; Fri, 15 Apr 2011 03:49:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAdms-0006t1-Uv for qemu-devel@nongnu.org; Fri, 15 Apr 2011 03:49:55 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:50822) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAdms-0006sw-Qf for qemu-devel@nongnu.org; Fri, 15 Apr 2011 03:49:54 -0400 Received: by wyb42 with SMTP id 42so2344199wyb.4 for ; Fri, 15 Apr 2011 00:49:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=BuBro9fB5xNPidBzNfEfOEoOjPYP5kEvTseNkmmAKNU=; b=GJhiRtDex/NH1a98ZgNjisNSHuhlmwe88z6HlmPNnjx2u2U5HtZNUdyJ5e2P9vMzdw aK0Fbfe8wQa+0tL9eKt8sTVd+sYqfgCEpr5UlP4MTA3Wx1eHhikBKoHyBTMX7plOliJ+ B2QcNdk8xtofiDPCbfKD5wZfpEIltrGb+Hb80= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=Hxo086XBi9ZYC1DSWMI1FhbUS3PevEDMWChof8ZcmGMYE2qR1j/jZ0Iu3KVhJct2to N2UTpLnXey9uiJsz7XAsSUni55QSL1UbZ7mnWhKRuBL3eDGjGXx2mXDOdh3BQ49kHzh6 l08VGEIPzN46MT8A4IJuVlzpE2H79+F21jDMY= Received: by 10.216.253.215 with SMTP id f65mr789456wes.14.1302853794009; Fri, 15 Apr 2011 00:49:54 -0700 (PDT) Received: from localhost (proxy.se.axis.com [195.60.68.148]) by mx.google.com with ESMTPS id r80sm1155696wei.15.2011.04.15.00.49.51 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 15 Apr 2011 00:49:52 -0700 (PDT) Date: Fri, 15 Apr 2011 09:49:46 +0200 From: "Edgar E. Iglesias" To: Paolo Bonzini Message-ID: <20110415074946.GB2423@edde.se.axis.com> References: <1302681826-10236-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1302681826-10236-1-git-send-email-pbonzini@redhat.com> User-Agent: Mutt/1.5.20 (2009-06-14) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Cc: qemu-devel@nongnu.org Subject: Re: [Qemu-devel] [PATCH v4 0/4] Fix -icount with iothread X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On Wed, Apr 13, 2011 at 10:03:42AM +0200, Paolo Bonzini wrote: > This series finally fixes -icount with iothread and avoids deadlocks > due to the vm_clock not making progress when the VM is stopped. > The crux of the fix is in patch 1, while patch 2 implements the > "clock warping" that fixes deadlocks in v2. Clock warping uses > the nanosecond resolution rt_clock timers introduced by my previous > series. > > With this in place, patch 3 can revert the previous attempt(s). > Finally, patch 4 makes the icount code clearer by finishing the > bugfix/reorganization of qemu_next_deadline vs. qemu_next_alarm_deadline. > > v1->v2: > reordered patches, renamed qemu_next_deadline > > v2->v3: > introduced warp timer > > v3->v4: > added comments to the code > > Paolo Bonzini (4): > really fix -icount in the iothread case > enable vm_clock to "warp" in the iothread+icount case > Revert wrong fixes for -icount in the iothread case > qemu_next_deadline should not consider host-time timers > > cpus.c | 13 ++++- > qemu-common.h | 1 + > qemu-timer.c | 169 ++++++++++++++++++++++++++++++++++++++++++++------------- > qemu-timer.h | 3 +- > roms/seabios | 2 +- > 5 files changed, 146 insertions(+), 42 deletions(-) I've applied this series, thanks alot for working on it. BTW, I removed this hunk from patch nr 2: --- Cheers diff --git a/roms/seabios b/roms/seabios index cc97564..06d0bdd 160000 --- a/roms/seabios +++ b/roms/seabios @@ -1 +1 @@ -Subproject commit cc975646af69f279396d4d5e1379ac6af80ee637 +Subproject commit 06d0bdd9e2e20377b3180e4986b14c8549b393e4