From 3d4e7d17a0bd9e139494187923c45fb15c3152a9 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 22 Jun 2022 15:43:52 +0200 Subject: [PATCH] qemu: validate: Remove unreachable checks for QEMU_CAPS_AUDIODEV MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We now only support qemu versions which already have the capability so we can remove this now unused code. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik Reviewed-by: Ján Tomko --- src/qemu/qemu_validate.c | 102 +-------------------------------------- 1 file changed, 1 insertion(+), 101 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 8d26b43f73..2862455902 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -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; } @@ -4663,105 +4656,15 @@ qemuValidateDomainDeviceDefAudio(virDomainAudioDef *audio, const virDomainDef *def, 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) { case VIR_DOMAIN_AUDIO_TYPE_NONE: - break; - case VIR_DOMAIN_AUDIO_TYPE_ALSA: - break; - 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: - 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: - 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: - 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: - 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.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; - } - } + case VIR_DOMAIN_AUDIO_TYPE_FILE: break; case VIR_DOMAIN_AUDIO_TYPE_SPICE: @@ -4772,9 +4675,6 @@ qemuValidateDomainDeviceDefAudio(virDomainAudioDef *audio, } break; - case VIR_DOMAIN_AUDIO_TYPE_FILE: - break; - case VIR_DOMAIN_AUDIO_TYPE_DBUS: if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISPLAY_DBUS)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",