Commit 74475455 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

change all other clock references to use nanosecond resolution accessors 



This was done with:

    sed -i 's/qemu_get_clock\>/qemu_get_clock_ns/' \
        $(git grep -l 'qemu_get_clock\>' )
    sed -i 's/qemu_new_timer\>/qemu_new_timer_ns/' \
        $(git grep -l 'qemu_new_timer\>' )

after checking that get_clock and new_timer never occur twice
on the same line.  There were no missed occurrences; however, even
if there had been, they would have been caught by the compiler.

There was exactly one false positive in qemu_run_timers:

     -    current_time = qemu_get_clock (clock);
     +    current_time = qemu_get_clock_ns (clock);

which is of course not in this patch.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 7bd427d8

audio/audio.c

+2 −2
Original line number Diff line number Diff line
@@ -1114,7 +1114,7 @@ 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 (vm_clock) + 1);

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

    }

    else {

        qemu_del_timer (s->ts);
@@ -1820,7 +1820,7 @@ static void audio_init (void) 
    QLIST_INIT (&s->cap_head);

    atexit (audio_atexit);



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

    s->ts = qemu_new_timer_ns (vm_clock, 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 (vm_clock);

    now = qemu_get_clock_ns (vm_clock);

    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 (vm_clock);

        int64_t now = qemu_get_clock_ns (vm_clock);

        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 (vm_clock);

    rate->start_ticks = qemu_get_clock_ns (vm_clock);

}



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 (vm_clock);

    now = qemu_get_clock_ns (vm_clock);

    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 (vm_clock);

    int64_t now = qemu_get_clock_ns (vm_clock);

    int64_t ticks = now - wav->old_ticks;

    int64_t bytes =

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

hw/acpi_piix4.c

+4 −4
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s); 
static uint32_t get_pmtmr(PIIX4PMState *s)

{

    uint32_t d;

    d = muldiv64(qemu_get_clock(vm_clock), PM_TIMER_FREQUENCY, get_ticks_per_sec());

    d = muldiv64(qemu_get_clock_ns(vm_clock), PM_TIMER_FREQUENCY, get_ticks_per_sec());

    return d & 0xffffff;

}
@@ -93,7 +93,7 @@ static int get_pmsts(PIIX4PMState *s) 
{

    int64_t d;



    d = muldiv64(qemu_get_clock(vm_clock), PM_TIMER_FREQUENCY,

    d = muldiv64(qemu_get_clock_ns(vm_clock), PM_TIMER_FREQUENCY,

                 get_ticks_per_sec());

    if (d >= s->tmr_overflow_time)

        s->pmsts |= ACPI_BITMASK_TIMER_STATUS;
@@ -149,7 +149,7 @@ static void pm_ioport_write(IORange *ioport, uint64_t addr, unsigned width, 
            pmsts = get_pmsts(s);

            if (pmsts & val & ACPI_BITMASK_TIMER_STATUS) {

                /* if TMRSTS is reset, then compute the new overflow time */

                d = muldiv64(qemu_get_clock(vm_clock), PM_TIMER_FREQUENCY,

                d = muldiv64(qemu_get_clock_ns(vm_clock), PM_TIMER_FREQUENCY,

                             get_ticks_per_sec());

                s->tmr_overflow_time = (d + 0x800000LL) & ~0x7fffffLL;

            }
@@ -413,7 +413,7 @@ static int piix4_pm_initfn(PCIDevice *dev) 
    register_ioport_write(s->smb_io_base, 64, 1, smb_ioport_writeb, &s->smb);

    register_ioport_read(s->smb_io_base, 64, 1, smb_ioport_readb, &s->smb);



    s->tmr_timer = qemu_new_timer(vm_clock, pm_tmr_timer, s);

    s->tmr_timer = qemu_new_timer_ns(vm_clock, pm_tmr_timer, s);



    qemu_system_powerdown = *qemu_allocate_irqs(piix4_powerdown, s, 1);