Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/audio/hda-codec.c | 9 ++++-----
hw/audio/trace-events | 4 ++++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c
index 9ee2f3d55f..13d4473f18 100644
--- a/hw/audio/hda-codec.c
+++ b/hw/audio/hda-codec.c
@@ -24,6 +24,7 @@
#include "intel-hda.h"
#include "intel-hda-defs.h"
#include "audio/audio.h"
+#include "trace.h"
/* -------------------------------------------------------------------------- */
@@ -394,8 +395,7 @@ static void hda_audio_set_running(HDAAudioStream *st, bool running)
return;
}
st->running = running;
- dprint(st->state, 1, "%s: %s (stream %d)\n", st->node->name,
- st->running ? "on" : "off", st->stream);
+ trace_hda_audio_running(st->node->name, st->stream, st->running);
if (st->state->use_timer) {
if (running) {
int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
@@ -449,9 +449,8 @@ static void hda_audio_setup(HDAAudioStream *st)
return;
}
- dprint(st->state, 1, "%s: format: %d x %s @ %d Hz\n",
- st->node->name, st->as.nchannels,
- fmt2name[st->as.fmt], st->as.freq);
+ trace_hda_audio_format(st->node->name, st->as.nchannels,
+ fmt2name[st->as.fmt], st->as.freq);
if (st->output) {
if (use_timer) {
diff --git a/hw/audio/trace-events b/hw/audio/trace-events
index fa1646d169..03340b9359 100644
--- a/hw/audio/trace-events
+++ b/hw/audio/trace-events
@@ -17,3 +17,7 @@ milkymist_ac97_in_cb(int avail, uint32_t remaining) "avail %d remaining %u"
milkymist_ac97_in_cb_transferred(int transferred) "transferred %d"
milkymist_ac97_out_cb(int free, uint32_t remaining) "free %d remaining %u"
milkymist_ac97_out_cb_transferred(int transferred) "transferred %d"
+
+# hw/audio/hda-codec.c
+hda_audio_running(const char *stream, int nr, bool running) "st %s, nr %d, run %d"
+hda_audio_format(const char *stream, int chan, const char *fmt, int freq) "st %s, %d x %s @ %d Hz"
--
2.9.3
On 05/07/2018 06:46 AM, Gerd Hoffmann wrote:
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Again:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/audio/hda-codec.c | 9 ++++-----
> hw/audio/trace-events | 4 ++++
> 2 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c
> index 9ee2f3d55f..13d4473f18 100644
> --- a/hw/audio/hda-codec.c
> +++ b/hw/audio/hda-codec.c
> @@ -24,6 +24,7 @@
> #include "intel-hda.h"
> #include "intel-hda-defs.h"
> #include "audio/audio.h"
> +#include "trace.h"
>
> /* -------------------------------------------------------------------------- */
>
> @@ -394,8 +395,7 @@ static void hda_audio_set_running(HDAAudioStream *st, bool running)
> return;
> }
> st->running = running;
> - dprint(st->state, 1, "%s: %s (stream %d)\n", st->node->name,
> - st->running ? "on" : "off", st->stream);
> + trace_hda_audio_running(st->node->name, st->stream, st->running);
> if (st->state->use_timer) {
> if (running) {
> int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
> @@ -449,9 +449,8 @@ static void hda_audio_setup(HDAAudioStream *st)
> return;
> }
>
> - dprint(st->state, 1, "%s: format: %d x %s @ %d Hz\n",
> - st->node->name, st->as.nchannels,
> - fmt2name[st->as.fmt], st->as.freq);
> + trace_hda_audio_format(st->node->name, st->as.nchannels,
> + fmt2name[st->as.fmt], st->as.freq);
>
> if (st->output) {
> if (use_timer) {
> diff --git a/hw/audio/trace-events b/hw/audio/trace-events
> index fa1646d169..03340b9359 100644
> --- a/hw/audio/trace-events
> +++ b/hw/audio/trace-events
> @@ -17,3 +17,7 @@ milkymist_ac97_in_cb(int avail, uint32_t remaining) "avail %d remaining %u"
> milkymist_ac97_in_cb_transferred(int transferred) "transferred %d"
> milkymist_ac97_out_cb(int free, uint32_t remaining) "free %d remaining %u"
> milkymist_ac97_out_cb_transferred(int transferred) "transferred %d"
> +
> +# hw/audio/hda-codec.c
> +hda_audio_running(const char *stream, int nr, bool running) "st %s, nr %d, run %d"
> +hda_audio_format(const char *stream, int chan, const char *fmt, int freq) "st %s, %d x %s @ %d Hz"
>
© 2016 - 2026 Red Hat, Inc.