audio: error message tweak
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 <kraxel@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-id: 20190124112055.547-6-kraxel@redhat.com
This commit is contained in:
parent
d175505bd6
commit
fb37ce92c8
|
@ -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) {
|
if (drv->options) {
|
||||||
audio_process_options (drv->name, 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;
|
return 0;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
if (msg) {
|
||||||
dolog("Could not init `%s' audio driver\n", drv->name);
|
dolog("Could not init `%s' audio driver\n", drv->name);
|
||||||
|
}
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1901,7 +1903,7 @@ static void audio_init (void)
|
||||||
if (drvname) {
|
if (drvname) {
|
||||||
driver = audio_driver_lookup(drvname);
|
driver = audio_driver_lookup(drvname);
|
||||||
if (driver) {
|
if (driver) {
|
||||||
done = !audio_driver_init(s, driver);
|
done = !audio_driver_init(s, driver, true);
|
||||||
} else {
|
} else {
|
||||||
dolog ("Unknown audio driver `%s'\n", drvname);
|
dolog ("Unknown audio driver `%s'\n", drvname);
|
||||||
dolog ("Run with -audio-help to list available drivers\n");
|
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++) {
|
for (i = 0; !done && i < ARRAY_SIZE(audio_prio_list); i++) {
|
||||||
driver = audio_driver_lookup(audio_prio_list[i]);
|
driver = audio_driver_lookup(audio_prio_list[i]);
|
||||||
if (driver && driver->can_be_default) {
|
if (driver && driver->can_be_default) {
|
||||||
done = !audio_driver_init(s, driver);
|
done = !audio_driver_init(s, driver, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!done) {
|
if (!done) {
|
||||||
driver = audio_driver_lookup("none");
|
driver = audio_driver_lookup("none");
|
||||||
done = !audio_driver_init(s, driver);
|
done = !audio_driver_init(s, driver, false);
|
||||||
assert(done);
|
assert(done);
|
||||||
dolog("warning: Using timer based audio emulation\n");
|
dolog("warning: Using timer based audio emulation\n");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue