[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/7] audio: error message tweak
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 6/7] audio: error message tweak |
Date: |
Thu, 24 Jan 2019 14:20:19 +0100 |
Only print a message about the failed driver initialization in case it
was the driver explicitly requested by the user via QEMU_AUDIO_DRV=$drv.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
---
audio/audio.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index 1ace47f510..d163ffbc88 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1762,7 +1762,7 @@ void AUD_help (void)
);
}
-static int audio_driver_init (AudioState *s, struct audio_driver *drv)
+static int audio_driver_init(AudioState *s, struct audio_driver *drv, bool msg)
{
if (drv->options) {
audio_process_options (drv->name, drv->options);
@@ -1776,7 +1776,9 @@ static int audio_driver_init (AudioState *s, struct
audio_driver *drv)
return 0;
}
else {
- dolog ("Could not init `%s' audio driver\n", drv->name);
+ if (msg) {
+ dolog("Could not init `%s' audio driver\n", drv->name);
+ }
return -1;
}
}
@@ -1901,7 +1903,7 @@ static void audio_init (void)
if (drvname) {
driver = audio_driver_lookup(drvname);
if (driver) {
- done = !audio_driver_init(s, driver);
+ done = !audio_driver_init(s, driver, true);
} else {
dolog ("Unknown audio driver `%s'\n", drvname);
dolog ("Run with -audio-help to list available drivers\n");
@@ -1912,14 +1914,14 @@ static void audio_init (void)
for (i = 0; !done && i < ARRAY_SIZE(audio_prio_list); i++) {
driver = audio_driver_lookup(audio_prio_list[i]);
if (driver && driver->can_be_default) {
- done = !audio_driver_init(s, driver);
+ done = !audio_driver_init(s, driver, false);
}
}
}
if (!done) {
driver = audio_driver_lookup("none");
- done = !audio_driver_init(s, driver);
+ done = !audio_driver_init(s, driver, false);
assert(done);
dolog("warning: Using timer based audio emulation\n");
}
--
2.9.3
- [Qemu-devel] [PULL 0/7] Audio 20190124 patches, Gerd Hoffmann, 2019/01/24
- [Qemu-devel] [PULL 6/7] audio: error message tweak,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 4/7] audio: use try-sdl for openbsd, Gerd Hoffmann, 2019/01/24
- [Qemu-devel] [PULL 7/7] audio: probe audio drivers by default, Gerd Hoffmann, 2019/01/24
- [Qemu-devel] [PULL 2/7] audio: use pkg-config, Gerd Hoffmann, 2019/01/24
- [Qemu-devel] [PULL 3/7] audio: allow optional audio drivers., Gerd Hoffmann, 2019/01/24
- [Qemu-devel] [PULL 1/7] audio: fix pc speaker init, Gerd Hoffmann, 2019/01/24
- [Qemu-devel] [PULL 5/7] audio: check for pulseaudio daemon pidfile, Gerd Hoffmann, 2019/01/24
- Re: [Qemu-devel] [PULL 0/7] Audio 20190124 patches, Peter Maydell, 2019/01/25