diff options
| author | Alex Bligh <alex@alex.org.uk> | 2013-08-21 16:02:39 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2013-08-22 15:58:05 +0200 |
| commit | e93379b039030c68d85693a4bee2b76f814108d2 (patch) | |
| tree | 6c017b5105f09bb60c8319499a49c660647aaf0b /backends/baum.c | |
| parent | 04d542c8b826a1196ca4f03f5a35d83035976bd1 (diff) | |
| download | focaccia-qemu-e93379b039030c68d85693a4bee2b76f814108d2.tar.gz focaccia-qemu-e93379b039030c68d85693a4bee2b76f814108d2.zip | |
aio / timers: Rename qemu_timer_* functions
Rename four functions in preparation for new API. Rename qemu_timer_expired to timer_expired Rename qemu_timer_expire_time_ns to timer_expire_time_ns Rename qemu_timer_pending to timer_pending Rename qemu_timer_expired_ns to timer_expired_ns Signed-off-by: Alex Bligh <alex@alex.org.uk> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'backends/baum.c')
| -rw-r--r-- | backends/baum.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/backends/baum.c b/backends/baum.c index 62aa784436..b08e1d5bca 100644 --- a/backends/baum.c +++ b/backends/baum.c @@ -314,9 +314,9 @@ static int baum_eat_packet(BaumDriverState *baum, const uint8_t *buf, int len) return 0; \ if (*cur++ != ESC) { \ DPRINTF("Broken packet %#2x, tossing\n", req); \ - if (qemu_timer_pending(baum->cellCount_timer)) { \ - qemu_del_timer(baum->cellCount_timer); \ - baum_cellCount_timer_cb(baum); \ + if (timer_pending(baum->cellCount_timer)) { \ + qemu_del_timer(baum->cellCount_timer); \ + baum_cellCount_timer_cb(baum); \ } \ return (cur - 2 - buf); \ } \ |