On 16.06.20 09:51, Philippe Mathieu-Daudé wrote: > To make code review easier, append the timer unit (milli-seconds) > to its variable name. > > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> > --- > include/hw/virtio/virtio-balloon.h | 2 +- > hw/virtio/virtio-balloon.c | 14 ++++++++------ > 2 files changed, 9 insertions(+), 7 deletions(-) > > diff --git a/include/hw/virtio/virtio-balloon.h > b/include/hw/virtio/virtio-balloon.h > index d49fef00ce..8a85fb1b88 100644 > --- a/include/hw/virtio/virtio-balloon.h > +++ b/include/hw/virtio/virtio-balloon.h > @@ -50,7 +50,7 @@ typedef struct VirtIOBalloon { > uint64_t stats[VIRTIO_BALLOON_S_NR]; > VirtQueueElement *stats_vq_elem; > size_t stats_vq_offset; > - QEMUTimer *stats_timer; > + QEMUTimer *stats_timer_ms; > IOThread *iothread; > QEMUBH *free_page_bh; > /* > diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c > index 10507b2a43..ad67cd53e4 100644 > --- a/hw/virtio/virtio-balloon.c > +++ b/hw/virtio/virtio-balloon.c > @@ -197,16 +197,17 @@ static bool balloon_stats_enabled(const VirtIOBalloon > *s) > static void balloon_stats_destroy_timer(VirtIOBalloon *s) > { > if (balloon_stats_enabled(s)) { > - timer_del(s->stats_timer); > - timer_free(s->stats_timer); > - s->stats_timer = NULL; > + timer_del(s->stats_timer_ms); > + timer_free(s->stats_timer_ms); > + s->stats_timer_ms = NULL; > s->stats_poll_interval = 0; > } > } > > static void balloon_stats_change_timer(VirtIOBalloon *s, int64_t secs) > { > - timer_mod(s->stats_timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + secs * > 1000); > + timer_mod(s->stats_timer_ms, > + qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + secs * 1000); > } > > static void balloon_stats_poll_cb(void *opaque) > @@ -315,8 +316,9 @@ static void balloon_stats_set_poll_interval(Object *obj, > Visitor *v, > } > > /* create a new timer */ > - g_assert(s->stats_timer == NULL); > - s->stats_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, balloon_stats_poll_cb, > s); > + g_assert(s->stats_timer_ms == NULL); > + s->stats_timer_ms = timer_new_ms(QEMU_CLOCK_VIRTUAL, > + balloon_stats_poll_cb, s); > s->stats_poll_interval = value; > balloon_stats_change_timer(s, 0); > } >
Reviewed-by: David Hildenbrand <da...@redhat.com> -- Thanks, David / dhildenb