OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

audio, qtest: get rid of QEMU_AUDIO_DRV

Browse Source 
Default audio devices can now be created with "-audio".  Tests for
soundcards were already using "-audiodev" if they want to specify a
particular backend, for the others remove the last remnants of
legacy audio configuration.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-10-05 11:45:55 +02:00
parent 63a13c0805
commit 912eef205a
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
audio/audio.c
View File

@ -1690,19 +1690,7 @@ static const VMStateDescription vmstate_audio = {
void audio_create_default_audiodevs(void) void audio_create_default_audiodevs(void)
{ {
const char *drvname = getenv("QEMU_AUDIO_DRV");
/* QEMU_AUDIO_DRV=none is used by libqtest. */
if (drvname && !g_str_equal(drvname, "none")) {
error_report("Please use -audiodev instead of QEMU_AUDIO_*");
exit(1);
}
for (int i = 0; audio_prio_list[i]; i++) { for (int i = 0; audio_prio_list[i]; i++) {
if (drvname && !g_str_equal(drvname, audio_prio_list[i])) {
continue;
}
if (audio_driver_lookup(audio_prio_list[i])) { if (audio_driver_lookup(audio_prio_list[i])) {
QDict *dict = qdict_new(); QDict *dict = qdict_new();
Audiodev *dev = NULL; Audiodev *dev = NULL;

4
tests/qtest/libqtest.c
View File

@ -421,9 +421,6 @@ static QTestState *G_GNUC_PRINTF(1, 2) qtest_spawn_qemu(const char *fmt, ...)
int sig = SIGKILL; int sig = SIGKILL;
procctl(P_PID, getpid(), PROC_PDEATHSIG_CTL, &sig); procctl(P_PID, getpid(), PROC_PDEATHSIG_CTL, &sig);
#endif /* __FreeBSD__ */ #endif /* __FreeBSD__ */
if (!g_setenv("QEMU_AUDIO_DRV", "none", true)) {
exit(1);
}
execlp("/bin/sh", "sh", "-c", command->str, NULL); execlp("/bin/sh", "sh", "-c", command->str, NULL);
exit(1); exit(1);
} }
@ -464,6 +461,7 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args)
"-chardev socket,path=%s,id=char0 " "-chardev socket,path=%s,id=char0 "
"-mon chardev=char0,mode=control " "-mon chardev=char0,mode=control "
"-display none " "-display none "
"-audio none "
"%s" "%s"
" -accel qtest", " -accel qtest",
socket_path, socket_path,