From ac70aafc28bec4d1014082f0c6659a368c5a95bd Mon Sep 17 00:00:00 2001 From: Alex Bligh Date: Wed, 21 Aug 2013 16:02:57 +0100 Subject: aio / timers: Use all timerlists in icount warp calculations Notify all timerlists derived from vm_clock in icount warp calculations. When calculating timer delay based on vm_clock deadline, use all timerlists. For compatibility, maintain an apparent bug where when using icount, if no vm_clock timer was set, qemu_clock_deadline would return INT32_MAX and always set an icount clock expiry about 2 seconds ahead. NB: thread safety - when different timerlists sit on different threads, this will need some locking. Signed-off-by: Alex Bligh Signed-off-by: Stefan Hajnoczi --- qtest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qtest.c') diff --git a/qtest.c b/qtest.c index 74f1842c1e..c038e24d51 100644 --- a/qtest.c +++ b/qtest.c @@ -412,7 +412,7 @@ static void qtest_process_command(CharDriverState *chr, gchar **words) if (words[1]) { ns = strtoll(words[1], NULL, 0); } else { - ns = qemu_clock_deadline(vm_clock); + ns = qemu_clock_deadline_ns_all(vm_clock); } qtest_clock_warp(qemu_get_clock_ns(vm_clock) + ns); qtest_send_prefix(chr); -- cgit v1.2.1