diff mbox

[v4,0/4] Fix -icount with iothread

Message ID 20110415074946.GB2423@edde.se.axis.com
State New
Headers show

Commit Message

Edgar E. Iglesias April 15, 2011, 7:49 a.m. UTC 
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

Comments

Paolo Bonzini April 15, 2011, 10:18 a.m. UTC | #1 
On 04/15/2011 09:49 AM, Edgar E. Iglesias wrote:
> BTW, I removed this hunk from patch nr 2:
> 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

That was correct, thanks.  I updated my submodules and will add a commit 
hook to prevent this from happening in the future.

Paolo
diff mbox

Patch

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