From nobody Sun Feb 8 05:54:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) client-ip=216.205.24.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1585258442; cv=none; d=zohomail.com; s=zohoarc; b=Q4d0GVh6GQ7rZxv0supnGnHq5qDjon4bw1eSjjsxECqUKzl84jc72bLqTSmeZ2NCjBVTl4tbntT0oz+766ufI+IJar13tLD7FpaJbAOYvzGbFPcc25Mi9/1uC5g3jil/Od6eFeEw62zslACXAmihyyOE86w6kmePq9HuE5bf4Zg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585258442; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jjmLUJqDLPOrLJAwYmCfy/9mIPcSZPSGtHSt05X7+XQ=; b=MvW8a9LR7xfAY3RmB+eOU8a0VLAz1NYExuXVaczgDWK7wo2a4QzTGjdOd2vPLjOIewoMWjYho2i5Pbq4T/bNeKRUcAv9k7I3Z+j8/wApCPhMpLugcrmc0rSR1AQhFwN6UavJu0X+cBaUkewaVefwW54ApiQo1dEAsLbIe7jOLLk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) by mx.zohomail.com with SMTPS id 158525844255221.83574029385875; Thu, 26 Mar 2020 14:34:02 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-289-GiyTlJV9N9mqnaBrmW1ssw-1; Thu, 26 Mar 2020 17:33:59 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AF577107ACC4; Thu, 26 Mar 2020 21:33:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 841195DC18; Thu, 26 Mar 2020 21:33:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2FEDA8A04D; Thu, 26 Mar 2020 21:33:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02QLW61e010319 for ; Thu, 26 Mar 2020 17:32:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id B90262037E4D; Thu, 26 Mar 2020 21:32:06 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B4A0A2026D67 for ; Thu, 26 Mar 2020 21:32:06 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 950048FF667 for ; Thu, 26 Mar 2020 21:32:06 +0000 (UTC) Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-430-QZFgjcEoOUCM4sWh1OFUkw-1; Thu, 26 Mar 2020 17:32:04 -0400 Received: by mail-qk1-f193.google.com with SMTP id b62so8695043qkf.6; Thu, 26 Mar 2020 14:32:04 -0700 (PDT) Received: from rekt.redhat.com ([2804:431:c7c6:e1ce:90c:c960:468:c347]) by smtp.gmail.com with ESMTPSA id x37sm2357719qtc.90.2020.03.26.14.32.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2020 14:32:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585258441; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=jjmLUJqDLPOrLJAwYmCfy/9mIPcSZPSGtHSt05X7+XQ=; b=biR1jD6dGhxF4dCwEm5epVo91cdBFFCypUpMjQxO8O3E3WZmNaChBWbA0kYj7FEVKm4zAn LZm6iUWfL3Rte0+ysw0AHtkrfZoYuOvCA9/2oc4kC8D95K4m8bOzKOCHyFnAOz9i9BSs2g VJVd/t6bDxJ7HJviohzlx7iNr0nBdzo= X-MC-Unique: GiyTlJV9N9mqnaBrmW1ssw-1 X-MC-Unique: QZFgjcEoOUCM4sWh1OFUkw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pERYNtMWhobHJbJnFAyIidricBnhryCzOmb+Xb/jByk=; b=nSz/YWdUOOy1eW5/7Nh/qCFFn3m8O5tNqtoypsZ5l6mBLiJh4uBU+VWAAQyC3KonQy DOeNE47ch0Gm/9VabbPFAiX07apbPlaQI8oWGvHEey5D19d4fQRoEvgEqshqsUb+yBdX 0HzshBRhop6uTAYh+eeGIbvXuXO04cFKzC7ilw27jaxopJIMzpUq75eyic4uCDJRFU3D cbxnIbRxNaGBswhz2fgDcJiurCwM4rcAbc43jkiiKGNOeqF3obv3ahuUeI3D46odMPDP OQyw6L8iBzMGJ6uSe++NN9zRM1h27cpK+mr7VqjYaW8jw4jROFZPIBnatNWK586wBURn GIRg== X-Gm-Message-State: ANhLgQ0SQL4CPoKIYL5KHyFg7ZYKHfRfbBer1a5Yz6dVx6YgTZel+cDj HGPZD31brHVuF8JBltDXUvtk4gmB X-Google-Smtp-Source: ADFU+vu9GZqWuyNAcUPI0D06HgGAAbhpBxlppQQob4hnmjfAtBbelkBNBLpYBHsPa8cY7VkorSRRJw== X-Received: by 2002:a05:620a:709:: with SMTP id 9mr11015002qkc.355.1585258323695; Thu, 26 Mar 2020 14:32:03 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH 13/15] qemu: move qemuDomainDeviceDefValidateSound() to qemu_validate.c Date: Thu, 26 Mar 2020 18:31:23 -0300 Message-Id: <20200326213125.2306013-14-danielhb413@gmail.com> In-Reply-To: <20200326213125.2306013-1-danielhb413@gmail.com> References: <20200326213125.2306013-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 02QLW61e010319 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , pkrempa@redhat.com, crobinso@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 76 +--------------------------------------- src/qemu/qemu_validate.c | 76 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_validate.h | 2 ++ 3 files changed, 79 insertions(+), 75 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 110d5b3fb2..ddcc0551db 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5061,80 +5061,6 @@ qemuDomainDeviceDefValidateHub(virDomainHubDefPtr hu= b, } =20 =20 -static int -qemuSoundCodecTypeToCaps(int type) -{ - switch (type) { - case VIR_DOMAIN_SOUND_CODEC_TYPE_DUPLEX: - return QEMU_CAPS_HDA_DUPLEX; - case VIR_DOMAIN_SOUND_CODEC_TYPE_MICRO: - return QEMU_CAPS_HDA_MICRO; - case VIR_DOMAIN_SOUND_CODEC_TYPE_OUTPUT: - return QEMU_CAPS_HDA_OUTPUT; - default: - return -1; - } -} - - -static int -qemuDomainDeviceDefValidateSound(virDomainSoundDefPtr sound, - virQEMUCapsPtr qemuCaps) -{ - size_t i; - - switch ((virDomainSoundModel) sound->model) { - case VIR_DOMAIN_SOUND_MODEL_USB: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_USB_AUDIO)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("usb-audio controller is not supported " - "by this QEMU binary")); - return -1; - } - break; - case VIR_DOMAIN_SOUND_MODEL_ICH9: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_ICH9_INTEL_HDA)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("The ich9-intel-hda audio controller " - "is not supported in this QEMU binary")); - return -1; - } - break; - - case VIR_DOMAIN_SOUND_MODEL_ES1370: - case VIR_DOMAIN_SOUND_MODEL_AC97: - case VIR_DOMAIN_SOUND_MODEL_ICH6: - case VIR_DOMAIN_SOUND_MODEL_SB16: - case VIR_DOMAIN_SOUND_MODEL_PCSPK: - break; - case VIR_DOMAIN_SOUND_MODEL_LAST: - virReportError(VIR_ERR_INTERNAL_ERROR, - _("sound card model '%s' is not supported by qemu"), - virDomainSoundModelTypeToString(sound->model)); - return -1; - } - - if (sound->model =3D=3D VIR_DOMAIN_SOUND_MODEL_ICH6 || - sound->model =3D=3D VIR_DOMAIN_SOUND_MODEL_ICH9) { - for (i =3D 0; i < sound->ncodecs; i++) { - const char *stype; - int type, flags; - - type =3D sound->codecs[i]->type; - stype =3D qemuSoundCodecTypeToString(type); - flags =3D qemuSoundCodecTypeToCaps(type); - - if (flags =3D=3D -1 || !virQEMUCapsGet(qemuCaps, flags)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("%s not supported in this QEMU binary"), = stype); - return -1; - } - } - } - - return 0; -} - static int qemuDomainDeviceDefValidateMemory(virDomainMemoryDefPtr mem, virQEMUCapsPtr qemuCaps) @@ -5835,7 +5761,7 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef = *dev, break; =20 case VIR_DOMAIN_DEVICE_SOUND: - ret =3D qemuDomainDeviceDefValidateSound(dev->data.sound, qemuCaps= ); + ret =3D qemuValidateDomainDeviceDefSound(dev->data.sound, qemuCaps= ); break; =20 case VIR_DOMAIN_DEVICE_MEMORY: diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 79fc56b849..58ed2512d4 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -22,6 +22,7 @@ =20 #include "qemu_validate.h" #include "qemu_block.h" +#include "qemu_command.h" #include "qemu_domain.h" #include "domain_conf.h" #include "virlog.h" @@ -3012,3 +3013,78 @@ qemuValidateDomainDeviceDefFS(virDomainFSDefPtr fs, =20 return 0; } + + +static int +qemuSoundCodecTypeToCaps(int type) +{ + switch (type) { + case VIR_DOMAIN_SOUND_CODEC_TYPE_DUPLEX: + return QEMU_CAPS_HDA_DUPLEX; + case VIR_DOMAIN_SOUND_CODEC_TYPE_MICRO: + return QEMU_CAPS_HDA_MICRO; + case VIR_DOMAIN_SOUND_CODEC_TYPE_OUTPUT: + return QEMU_CAPS_HDA_OUTPUT; + default: + return -1; + } +} + + +int +qemuValidateDomainDeviceDefSound(virDomainSoundDefPtr sound, + virQEMUCapsPtr qemuCaps) +{ + size_t i; + + switch ((virDomainSoundModel) sound->model) { + case VIR_DOMAIN_SOUND_MODEL_USB: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_USB_AUDIO)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("usb-audio controller is not supported " + "by this QEMU binary")); + return -1; + } + break; + case VIR_DOMAIN_SOUND_MODEL_ICH9: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_ICH9_INTEL_HDA)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("The ich9-intel-hda audio controller " + "is not supported in this QEMU binary")); + return -1; + } + break; + + case VIR_DOMAIN_SOUND_MODEL_ES1370: + case VIR_DOMAIN_SOUND_MODEL_AC97: + case VIR_DOMAIN_SOUND_MODEL_ICH6: + case VIR_DOMAIN_SOUND_MODEL_SB16: + case VIR_DOMAIN_SOUND_MODEL_PCSPK: + break; + case VIR_DOMAIN_SOUND_MODEL_LAST: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("sound card model '%s' is not supported by qemu"), + virDomainSoundModelTypeToString(sound->model)); + return -1; + } + + if (sound->model =3D=3D VIR_DOMAIN_SOUND_MODEL_ICH6 || + sound->model =3D=3D VIR_DOMAIN_SOUND_MODEL_ICH9) { + for (i =3D 0; i < sound->ncodecs; i++) { + const char *stype; + int type, flags; + + type =3D sound->codecs[i]->type; + stype =3D qemuSoundCodecTypeToString(type); + flags =3D qemuSoundCodecTypeToCaps(type); + + if (flags =3D=3D -1 || !virQEMUCapsGet(qemuCaps, flags)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("%s not supported in this QEMU binary"), = stype); + return -1; + } + } + } + + return 0; +} diff --git a/src/qemu/qemu_validate.h b/src/qemu/qemu_validate.h index 623f80fcb2..e61a932809 100644 --- a/src/qemu/qemu_validate.h +++ b/src/qemu/qemu_validate.h @@ -60,3 +60,5 @@ int qemuValidateDomainDeviceDefFS(virDomainFSDefPtr fs, const virDomainDef *def, virQEMUDriverPtr driver, virQEMUCapsPtr qemuCaps); +int qemuValidateDomainDeviceDefSound(virDomainSoundDefPtr sound, + virQEMUCapsPtr qemuCaps); --=20 2.25.1