]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commit
Correct alarm deadline computation
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 3 Feb 2011 13:49:00 +0000 (14:49 +0100)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 4 Feb 2011 12:53:51 +0000 (06:53 -0600)
commitbbd9827cc7c83c433bbd1d253b8cd27d56acd071
tree84aab0eaa1239152863f529e4e4e40ebb11b51e8
parentd7f88b4bbdc720554c62e1924441291b8945f083
Correct alarm deadline computation

When the QEMU_CLOCK_HOST clock was added, computation of its
deadline was added to qemu_next_deadline, which is correct but
incomplete.

I noticed this by reading the very convoluted rules whereby
qemu_next_deadline_dyntick is computed, which miss QEMU_CLOCK_HOST
when use_icount is true.  This patch inlines qemu_next_deadline
into qemu_next_deadline_dyntick, and then corrects the logic to skip
only QEMU_CLOCK_VIRTUAL when use_icount is true.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 6ad0a1ed21ecd187dbe3239eb45c3598672af6a8)
qemu-timer.c