This is a "real" fix for -icount, real in the sense that it works in all cases including those that weren't fixed by my first attempt.
Patch 1 is a sequel to my reorganization of qemu_next_deadline vs. qemu_next_alarm_deadline. Patch 2 reverts the past attempts, patch 3 is the three-line fix. Paolo Bonzini (3): qemu_next_deadline should not consider host-time timers Revert wrong fix for -icount in the iothread case really fix -icount in the iothread case cpus.c | 3 ++ qemu-timer.c | 73 +++++++++++++++++++++++++++++---------------------------- 2 files changed, 40 insertions(+), 36 deletions(-) -- 1.7.4