summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorHans de Goede2013-10-09 21:33:44 +0200
committerGerd Hoffmann2013-10-23 10:37:27 +0200
commitb4350deed67b95651896ddb60cf9f765093a4848 (patch)
treea2ce8af21eefb0fa799600a1603478bcc176ae2b /audio
parentMerge remote-tracking branch 'qemu-kvm/uq/master' into staging (diff)
downloadqemu-b4350deed67b95651896ddb60cf9f765093a4848.tar.gz
qemu-b4350deed67b95651896ddb60cf9f765093a4848.tar.xz
qemu-b4350deed67b95651896ddb60cf9f765093a4848.zip
audio: honor QEMU_AUDIO_TIMER_PERIOD instead of waking up every *nano* second
Now that we no longer have MIN_REARM_TIMER_NS a bug in the audio subsys has clearly shown it self by trying to make a timer fire every nano second. Note we have a similar problem in 1.6, 1.5 and older but there MIN_REARM_TIMER_NS limits the wakeups caused by audio being active to 4000 times / second. This still causes a host cpu load of 50 % for simply playing audio, where as with this patch git master is at 13%, so we should backport this to 1.5 and 1.6 too. Note this will not apply to 1.5 and 1.6 as is. Cc: qemu-stable@nongnu.org Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'audio')
-rw-r--r--audio/audio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/audio/audio.c b/audio/audio.c
index af4cdf60e7..b3db67979d 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);