On 27/01/2026 18:24, [email protected] wrote:
From: Marc-André Lureau <[email protected]>
Replace the custom audio logging infrastructure (dolog macro) with
standard QEMU error reporting (error_report).
Signed-off-by: Marc-André Lureau <[email protected]>
---
audio/pwaudio.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/audio/pwaudio.c b/audio/pwaudio.c
index 39b2b8f0a0d..c30738c16ef 100644
--- a/audio/pwaudio.c
+++ b/audio/pwaudio.c
@@ -20,14 +20,13 @@
#include <spa/param/props.h>
#include <pipewire/pipewire.h>
+
+#include "audio_int.h"
#include "trace.h"
-#define AUDIO_CAP "pipewire"
#define RINGBUFFER_SIZE (1u << 22)
#define RINGBUFFER_MASK (RINGBUFFER_SIZE - 1)
-#include "audio_int.h"
-
#define TYPE_AUDIO_PW "audio-pipewire"
OBJECT_DECLARE_SIMPLE_TYPE(AudioPw, AUDIO_PW)
@@ -358,7 +357,7 @@ audfmt_to_pw(AudioFormat fmt, bool big_endian)
format = big_endian ? SPA_AUDIO_FORMAT_F32_BE :
SPA_AUDIO_FORMAT_F32_LE;
break;
default:
- dolog("Internal logic error: Bad audio format %d\n", fmt);
+ error_report("pipewire: internal logic error: bad audio format %d",
fmt);
format = SPA_AUDIO_FORMAT_U8;
break;
}
@@ -418,7 +417,7 @@ pw_to_audfmt(enum spa_audio_format fmt, int *endianness,
return AUDIO_FORMAT_F32;
default:
*sample_size = 1;
- dolog("Internal logic error: Bad spa_audio_format %d\n", fmt);
+ error_report("pipewire: internal logic error: bad spa_audio_format
%d", fmt);
return AUDIO_FORMAT_U8;
}
}
@@ -518,7 +517,7 @@ qpw_set_position(uint32_t channels, uint32_t
position[SPA_AUDIO_MAX_CHANNELS])
position[0] = SPA_AUDIO_CHANNEL_MONO;
break;
default:
- dolog("Internal error: unsupported channel count %d\n", channels);
+ error_report("pipewire: unsupported channel count %d", channels);
}
}
Reviewed-by: Mark Cave-Ayland <[email protected]>
ATB,
Mark.
