Commit e2cb2902 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'kraxel/audio.2' into staging 



* kraxel/audio.2:
  audio: honor QEMU_AUDIO_TIMER_PERIOD instead of waking up every *nano* second

Message-id: 1382622110-19460-1-git-send-email-kraxel@redhat.com
Signed-off-by: default avatarAnthony Liguori <anthony@codemonkey.ws>
parents cb95ec1b b4350dee

audio/audio.c

+2 −1
Original line number Diff line number Diff line
@@ -1124,7 +1124,8 @@ static int audio_is_timer_needed (void) 
static void audio_reset_timer (AudioState *s)

{

    if (audio_is_timer_needed ()) {

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

        timer_mod (s->ts,

            qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + conf.period.ticks);

    }

    else {

        timer_del (s->ts);