@samitouri / QOSamiQemu / commits / 1f11eb930e

audio: constify audsettings argument

It shouldn't be modified by the audio functions. Reviewed-by: Mark Cave-Ayland <mark.caveayland@nutanix.com> Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Marc-André Lureau committed Jan 19, 2026 at 16:37 UTC 1f11eb930e08607d7047b72adc55ca2991075092
4 files changed +10 -10
audio/audio.c
+4 -4
@@ -170,7 +170,7 @@ void AUD_log (const char *cap, const char *fmt, ...)
170 va_end (ap);
171 }
172
173 -static void audio_print_settings (struct audsettings *as)
173 +static void audio_print_settings (const struct audsettings *as)
174 {
175 dolog ("frequency=%d nchannels=%d fmt=", as->freq, as->nchannels);
176
@@ -216,7 +216,7 @@ static void audio_print_settings (struct audsettings *as)
216 AUD_log (NULL, "\n");
217 }
218
219 -static int audio_validate_settings (struct audsettings *as)
219 +static int audio_validate_settings (const struct audsettings *as)
220 {
221 int invalid;
222
@@ -241,7 +241,7 @@ static int audio_validate_settings (struct audsettings *as)
241 return invalid ? -1 : 0;
242 }
243
244 -static int audio_pcm_info_eq (struct audio_pcm_info *info, struct audsettings *as)
244 +static int audio_pcm_info_eq (struct audio_pcm_info *info, const struct audsettings *as)
245 {
246 int bits = 8;
247 bool is_signed = false, is_float = false;
@@ -281,7 +281,7 @@ static int audio_pcm_info_eq (struct audio_pcm_info *info, struct audsettings *a
281 && info->swap_endianness == (as->endianness != HOST_BIG_ENDIAN);
282 }
283
284 -void audio_pcm_init_info (struct audio_pcm_info *info, struct audsettings *as)
284 +void audio_pcm_init_info (struct audio_pcm_info *info, const struct audsettings *as)
285 {
286 int bits = 8, mul;
287 bool is_signed = false, is_float = false;
audio/audio_int.h
+1 -1
@@ -265,7 +265,7 @@ extern const char *audio_prio_list[];
265
266 void audio_driver_register(audio_driver *drv);
267
268 -void audio_pcm_init_info (struct audio_pcm_info *info, struct audsettings *as);
268 +void audio_pcm_init_info (struct audio_pcm_info *info, const struct audsettings *as);
269 void audio_pcm_info_clear_buf (struct audio_pcm_info *info, void *buf, int len);
270
271 int audio_bug (const char *funcname, int cond);
audio/audio_template.h
+3 -3
@@ -159,7 +159,7 @@ static int glue (audio_pcm_sw_init_, TYPE) (
159 SW *sw,
160 HW *hw,
161 const char *name,
162 - struct audsettings *as
162 + const struct audsettings *as
163 )
164 {
165 int err;
@@ -426,7 +426,7 @@ static HW *glue(audio_pcm_hw_add_, TYPE)(AudioBackend *s, struct audsettings *as
426 static SW *glue(audio_pcm_create_voice_pair_, TYPE)(
427 AudioBackend *s,
428 const char *sw_name,
429 - struct audsettings *as
429 + const struct audsettings *as
430 )
431 {
432 SW *sw;
@@ -491,7 +491,7 @@ SW *glue (AUD_open_, TYPE) (
491 const char *name,
492 void *callback_opaque ,
493 audio_callback_fn callback_fn,
494 - struct audsettings *as
494 + const struct audsettings *as
495 )
496 {
497 AudioBackend *s = be;
include/qemu/audio.h
+2 -2
@@ -58,7 +58,7 @@ SWVoiceOut *AUD_open_out (
58 const char *name,
59 void *callback_opaque,
60 audio_callback_fn callback_fn,
61 - struct audsettings *settings
61 + const struct audsettings *settings
62 );
63
64 void AUD_close_out (AudioBackend *be, SWVoiceOut *sw);
@@ -97,7 +97,7 @@ SWVoiceIn *AUD_open_in(
97 const char *name,
98 void *callback_opaque,
99 audio_callback_fn callback_fn,
100 - struct audsettings *settings
100 + const struct audsettings *settings
101 );
102
103 void AUD_close_in(AudioBackend *be, SWVoiceIn *sw);