From: Fam Zheng Date: Mon, 19 Jan 2015 09:51:43 +0000 (+0800) Subject: qtest: Fix deadloop by running main loop AIO context's timers X-Git-Tag: qemu-xen-4.6.0-rc1~34^2~13 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=987aba53db2e9e62e3f0ae0c22aa0381a735e282;p=qemu-upstream-unstable.git qtest: Fix deadloop by running main loop AIO context's timers qemu_clock_run_timers() only takes care of main_loop_tlg, we shouldn't forget aio timer list groups. Currently, the qemu_clock_deadline_ns_all (a few lines above) counts all the timergroups of this clock type, including aio tlg, but we don't fire them, so they are never cleared, which makes a dead loop. For example, this function hangs when trying to drive throttled block request queue with qtest clock_step. Signed-off-by: Fam Zheng Acked-by: Paolo Bonzini Message-id: 1421661103-29153-1-git-send-email-famz@redhat.com Signed-off-by: Stefan Hajnoczi (cherry picked from commit efef88b3d9ad4325172ed288032807fa88d683cc) Signed-off-by: Michael Roth --- diff --git a/cpus.c b/cpus.c index 0c33458bb..ff555e246 100644 --- a/cpus.c +++ b/cpus.c @@ -372,15 +372,19 @@ static void icount_warp_rt(void *opaque) void qtest_clock_warp(int64_t dest) { int64_t clock = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + AioContext *aio_context; assert(qtest_enabled()); + aio_context = qemu_get_aio_context(); while (clock < dest) { int64_t deadline = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL); int64_t warp = qemu_soonest_timeout(dest - clock, deadline); + seqlock_write_lock(&timers_state.vm_clock_seqlock); timers_state.qemu_icount_bias += warp; seqlock_write_unlock(&timers_state.vm_clock_seqlock); qemu_clock_run_timers(QEMU_CLOCK_VIRTUAL); + timerlist_run_timers(aio_context->tlg.tl[QEMU_CLOCK_VIRTUAL]); clock = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); } qemu_clock_notify(QEMU_CLOCK_VIRTUAL);