Commit bc72ad67 authored by Alex Bligh's avatar Alex Bligh Committed by Stefan Hajnoczi
Browse files

aio / timers: Switch entire codebase to the new timer API 



This is an autogenerated patch using scripts/switch-timer-api.

Switch the entire code base to using the new timer API.

Note this patch may introduce some line length issues.

Signed-off-by: default avatarAlex Bligh <alex@alex.org.uk>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent fe10ab54

arch_init.c

+6 −6
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static void migration_bitmap_sync(void) 
    }



    if (!start_time) {

        start_time = qemu_get_clock_ms(rt_clock);

        start_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);

    }



    trace_migration_bitmap_sync_start();
@@ -410,7 +410,7 @@ static void migration_bitmap_sync(void) 
    trace_migration_bitmap_sync_end(migration_dirty_pages

                                    - num_dirty_pages_init);

    num_dirty_pages_period += migration_dirty_pages - num_dirty_pages_init;

    end_time = qemu_get_clock_ms(rt_clock);

    end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);



    /* more than 1 second = 1000 millisecons */

    if (end_time > start_time + 1000) {
@@ -672,7 +672,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) 


    ram_control_before_iterate(f, RAM_CONTROL_ROUND);



    t0 = qemu_get_clock_ns(rt_clock);

    t0 = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);

    i = 0;

    while ((ret = qemu_file_rate_limit(f)) == 0) {

        int bytes_sent;
@@ -691,7 +691,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) 
           iterations

        */

        if ((i & 63) == 0) {

            uint64_t t1 = (qemu_get_clock_ns(rt_clock) - t0) / 1000000;

            uint64_t t1 = (qemu_clock_get_ns(QEMU_CLOCK_REALTIME) - t0) / 1000000;

            if (t1 > MAX_WAIT) {

                DPRINTF("big wait: %" PRIu64 " milliseconds, %d iterations\n",

                        t1, i);
@@ -1217,11 +1217,11 @@ static void check_guest_throttling(void) 
    }



    if (!t0)  {

        t0 = qemu_get_clock_ns(rt_clock);

        t0 = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);

        return;

    }



    t1 = qemu_get_clock_ns(rt_clock);

    t1 = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);



    /* If it has been more than 40 ms since the last time the guest

     * was throttled then do it again.

audio/audio.c

+3 −3
Original line number Diff line number Diff line
@@ -1124,10 +1124,10 @@ static int audio_is_timer_needed (void) 
static void audio_reset_timer (AudioState *s)

{

    if (audio_is_timer_needed ()) {

        qemu_mod_timer (s->ts, qemu_get_clock_ns (vm_clock) + 1);

        timer_mod (s->ts, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 1);

    }

    else {

        qemu_del_timer (s->ts);

        timer_del (s->ts);

    }

}
@@ -1834,7 +1834,7 @@ static void audio_init (void) 
    QLIST_INIT (&s->cap_head);

    atexit (audio_atexit);



    s->ts = qemu_new_timer_ns (vm_clock, audio_timer, s);

    s->ts = timer_new_ns(QEMU_CLOCK_VIRTUAL, audio_timer, s);

    if (!s->ts) {

        hw_error("Could not create audio timer\n");

    }

audio/noaudio.c

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static int no_run_out (HWVoiceOut *hw, int live) 
    int64_t ticks;

    int64_t bytes;



    now = qemu_get_clock_ns (vm_clock);

    now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);

    ticks = now - no->old_ticks;

    bytes = muldiv64 (ticks, hw->info.bytes_per_second, get_ticks_per_sec ());

    bytes = audio_MIN (bytes, INT_MAX);
@@ -102,7 +102,7 @@ static int no_run_in (HWVoiceIn *hw) 
    int samples = 0;



    if (dead) {

        int64_t now = qemu_get_clock_ns (vm_clock);

        int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);

        int64_t ticks = now - no->old_ticks;

        int64_t bytes =

            muldiv64 (ticks, hw->info.bytes_per_second, get_ticks_per_sec ());

audio/spiceaudio.c

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void spice_audio_fini (void *opaque) 
static void rate_start (SpiceRateCtl *rate)

{

    memset (rate, 0, sizeof (*rate));

    rate->start_ticks = qemu_get_clock_ns (vm_clock);

    rate->start_ticks = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);

}



static int rate_get_samples (struct audio_pcm_info *info, SpiceRateCtl *rate)
@@ -91,7 +91,7 @@ static int rate_get_samples (struct audio_pcm_info *info, SpiceRateCtl *rate) 
    int64_t bytes;

    int64_t samples;



    now = qemu_get_clock_ns (vm_clock);

    now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);

    ticks = now - rate->start_ticks;

    bytes = muldiv64 (ticks, info->bytes_per_second, get_ticks_per_sec ());

    samples = (bytes - rate->bytes_sent) >> info->shift;

audio/wavaudio.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static int wav_run_out (HWVoiceOut *hw, int live) 
    int rpos, decr, samples;

    uint8_t *dst;

    struct st_sample *src;

    int64_t now = qemu_get_clock_ns (vm_clock);

    int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);

    int64_t ticks = now - wav->old_ticks;

    int64_t bytes =

        muldiv64 (ticks, hw->info.bytes_per_second, get_ticks_per_sec ());