|
 |
9ae3a8 |
From 0bdb440567cacd42675c39d97fb19b20e77d93da Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
Date: Wed, 15 Jan 2014 09:14:31 -0500
|
|
|
9ae3a8 |
Subject: [PATCH 04/14] audio: honor QEMU_AUDIO_TIMER_PERIOD instead of waking
|
|
|
9ae3a8 |
up every *nano* second.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <23a0c5622fb294ab7cbcf3a812f5ab2f2e47b461.1389776721.git.mrezanin@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56719
|
|
|
9ae3a8 |
O-Subject: [RHEL7 qemu-kvm PATCH 1/3] audio: honor QEMU_AUDIO_TIMER_PERIOD instead of waking up every *nano* second.
|
|
|
9ae3a8 |
Bugzilla: 1017636
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
This is manual backport of upstream commit b4350deed:
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Now that we no longer have MIN_REARM_TIMER_NS a bug in the audio subsys has
|
|
|
9ae3a8 |
clearly shown it self by trying to make a timer fire every nano second.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Note we have a similar problem in 1.6, 1.5 and older but there
|
|
|
9ae3a8 |
MIN_REARM_TIMER_NS limits the wakeups caused by audio being active to
|
|
|
9ae3a8 |
4000 times / second. This still causes a host cpu load of 50 % for simply
|
|
|
9ae3a8 |
playing audio, where as with this patch git master is at 13%, so we should
|
|
|
9ae3a8 |
backport this to 1.5 and 1.6 too.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Note this will not apply to 1.5 and 1.6 as is.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Cc: qemu-stable@nongnu.org
|
|
|
9ae3a8 |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RHEL does not use new timer api so patch couldn't be cherry picked.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
Upstream: b4350deed67b95651896ddb60cf9f765093a4848
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
audio/audio.c | 3 ++-
|
|
|
9ae3a8 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
audio/audio.c | 3 ++-
|
|
|
9ae3a8 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/audio/audio.c b/audio/audio.c
|
|
|
9ae3a8 |
index 02bb886..ebf7d3f 100644
|
|
|
9ae3a8 |
--- a/audio/audio.c
|
|
|
9ae3a8 |
+++ b/audio/audio.c
|
|
|
9ae3a8 |
@@ -1124,7 +1124,8 @@ static int audio_is_timer_needed (void)
|
|
|
9ae3a8 |
static void audio_reset_timer (AudioState *s)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
if (audio_is_timer_needed ()) {
|
|
|
9ae3a8 |
- qemu_mod_timer (s->ts, qemu_get_clock_ns (vm_clock) + 1);
|
|
|
9ae3a8 |
+ qemu_mod_timer (s->ts,
|
|
|
9ae3a8 |
+ qemu_get_clock_ns (vm_clock) + conf.period.ticks);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
else {
|
|
|
9ae3a8 |
qemu_del_timer (s->ts);
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|