[Xen-changelog] [qemu-upstream-unstable] audio: honor QEMU_AUDIO_TIMER_PERIOD instead of waking up every *nano* second

[patchbot@xxxxxxx]

commit 91a2cf3d0b367c3f009a83637fc5255fdf2cf8eb
Author:     Hans de Goede <hdegoede@xxxxxxxxxx>
AuthorDate: Wed Oct 9 21:33:44 2013 +0200
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Tue Dec 3 15:59:25 2013 -0600

    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@xxxxxxxxxx
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Gerd Hoffmann <kraxel@xxxxxxxxxx>
    (cherry picked from commit b4350deed67b95651896ddb60cf9f765093a4848)
    
    Conflicts:
    
        audio/audio.c
    
    *fixed to reflect 1.6 timer function/clock names
    
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 audio/audio.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/audio/audio.c b/audio/audio.c
index 02bb886..bcd41a9 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 ()) {
-        qemu_mod_timer (s->ts, qemu_get_clock_ns (vm_clock) + 1);
+        qemu_mod_timer (s->ts,
+            qemu_get_clock_ns(vm_clock) + conf.period.ticks);
     }
     else {
         qemu_del_timer (s->ts);
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog