External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 12:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: validate: Remove unreachable checks for QEMU_CAPS_AUDIODEV

Browse Source 
We now only support qemu versions which already have the capability so
we can remove this now unused code.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-06-22 15:43:52 +02:00
parent d348a4c8b6
commit 3d4e7d17a0
1 changed files with 1 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
src/qemu/qemu_validate.c
View File

@ -1476,13 +1476,6 @@ qemuValidateDomainDef(const virDomainDef *def,
} }
} }
if (def->naudios > 1 &&
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("only one audio backend is supported with this QEMU binary"));
return -1;
}
return 0; return 0;
} }
@ -4663,105 +4656,15 @@ qemuValidateDomainDeviceDefAudio(virDomainAudioDef *audio,
const virDomainDef *def, const virDomainDef *def,
virQEMUCaps *qemuCaps G_GNUC_UNUSED) virQEMUCaps *qemuCaps G_GNUC_UNUSED)
{ {
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
if (audio->input.mixingEngine == VIR_TRISTATE_BOOL_NO ||
audio->output.mixingEngine == VIR_TRISTATE_BOOL_NO) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("disabling audio mixing engine is not supported with this QEMU"));
return -1;
}
if ((audio->input.bufferLength ||
audio->output.bufferLength) &&
(audio->type != VIR_DOMAIN_AUDIO_TYPE_PULSEAUDIO &&
audio->type != VIR_DOMAIN_AUDIO_TYPE_COREAUDIO &&
audio->type != VIR_DOMAIN_AUDIO_TYPE_SDL)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("setting audio buffer length is not supported with this QEMU"));
return -1;
}
}
switch (audio->type) { switch (audio->type) {
case VIR_DOMAIN_AUDIO_TYPE_NONE: case VIR_DOMAIN_AUDIO_TYPE_NONE:
break;
case VIR_DOMAIN_AUDIO_TYPE_ALSA: case VIR_DOMAIN_AUDIO_TYPE_ALSA:
break;
case VIR_DOMAIN_AUDIO_TYPE_COREAUDIO: case VIR_DOMAIN_AUDIO_TYPE_COREAUDIO:
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
if (audio->input.bufferLength) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("setting audio buffer length is not supported with this QEMU"));
return -1;
}
if (audio->backend.coreaudio.input.bufferCount) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("setting audio buffer count is not supported with this QEMU"));
return -1;
}
}
break;
case VIR_DOMAIN_AUDIO_TYPE_JACK: case VIR_DOMAIN_AUDIO_TYPE_JACK:
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("'jack' audio backend is not supported with this QEMU"));
return -1;
}
break;
case VIR_DOMAIN_AUDIO_TYPE_OSS: case VIR_DOMAIN_AUDIO_TYPE_OSS:
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
if (audio->backend.oss.input.bufferCount !=
audio->backend.oss.output.bufferCount) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("setting audio buffer count is not supported with this QEMU"));
return -1;
}
}
break;
case VIR_DOMAIN_AUDIO_TYPE_PULSEAUDIO: case VIR_DOMAIN_AUDIO_TYPE_PULSEAUDIO:
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
if (audio->backend.pulseaudio.input.streamName ||
audio->backend.pulseaudio.output.streamName) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("setting audio stream name is not supported with this QEMU"));
return -1;
}
if (audio->backend.pulseaudio.input.latency ||
audio->backend.pulseaudio.output.latency) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("setting audio latency is not supported with this QEMU"));
return -1;
}
if (audio->input.bufferLength != audio->output.bufferLength) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("setting audio buffer length is not supported with this QEMU"));
return -1;
}
}
break;
case VIR_DOMAIN_AUDIO_TYPE_SDL: case VIR_DOMAIN_AUDIO_TYPE_SDL:
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) { case VIR_DOMAIN_AUDIO_TYPE_FILE:
if (audio->input.bufferLength) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("setting audio buffer length is not supported with this QEMU"));
return -1;
}
if (audio->backend.sdl.input.bufferCount ||
audio->backend.sdl.output.bufferCount) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("setting audio buffer count is not supported with this QEMU"));
return -1;
}
}
break; break;
case VIR_DOMAIN_AUDIO_TYPE_SPICE: case VIR_DOMAIN_AUDIO_TYPE_SPICE:
@ -4772,9 +4675,6 @@ qemuValidateDomainDeviceDefAudio(virDomainAudioDef *audio,
} }
break; break;
case VIR_DOMAIN_AUDIO_TYPE_FILE:
break;
case VIR_DOMAIN_AUDIO_TYPE_DBUS: case VIR_DOMAIN_AUDIO_TYPE_DBUS:
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISPLAY_DBUS)) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISPLAY_DBUS)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",