[Qemu-devel] [PULL for-1.7 0/1] audio bugfix

[Qemu-devel] [PULL for-1.7 0/1] audio bugfix

[Gerd Hoffmann]

  Hi,

Single audio bugfix for 1.7.

please pull,
  Gerd

The following changes since commit fc8ead74674b7129e8f31c2595c76658e5622197:

  Merge remote-tracking branch 'qemu-kvm/uq/master' into staging (2013-10-18 10:03:24 -0700)

are available in the git repository at:


  git://git.kraxel.org/qemu audio.2

for you to fetch changes up to b4350deed67b95651896ddb60cf9f765093a4848:

  audio: honor QEMU_AUDIO_TIMER_PERIOD instead of waking up every *nano* second (2013-10-23 10:37:27 +0200)

----------------------------------------------------------------
Hans de Goede (1):
      audio: honor QEMU_AUDIO_TIMER_PERIOD instead of waking up every *nano* second

 audio/audio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[Qemu-devel] [PATCH 1/1] audio: honor QEMU_AUDIO_TIMER_PERIOD instead of waking up every *nano* second

[Gerd Hoffmann]

From: Hans de Goede <hdegoede@redhat.com>

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>
---
 audio/audio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);
-- 
1.8.3.1