summaryrefslogtreecommitdiffstats
path: root/audio/audio.c
diff options
context:
space:
mode:
authorAnthony Liguori <anthony@codemonkey.ws>2013-10-31 17:00:55 +0100
committerAnthony Liguori <anthony@codemonkey.ws>2013-10-31 17:00:55 +0100
commite2cb2902bacb0efaa4adf680719aa77758dd33cd (patch)
treebe2a466a0ea9e2a8cdb2a9c870e88f1ef73082af /audio/audio.c
parentcb95ec1b83ae3972a976e5331f9e772cde1ebd1c (diff)
parentb4350deed67b95651896ddb60cf9f765093a4848 (diff)
downloadhqemu-e2cb2902bacb0efaa4adf680719aa77758dd33cd.zip
hqemu-e2cb2902bacb0efaa4adf680719aa77758dd33cd.tar.gz
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: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'audio/audio.c')
-rw-r--r--audio/audio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/audio/audio.c b/audio/audio.c
index af4cdf6..b3db679 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -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);
OpenPOWER on IntegriCloud