From nobody Sun Feb 8 14:53:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1575933376; cv=none; d=zohomail.com; s=zohoarc; b=PhHYzd1l/KMhS9U3K5kNFaGZtjuuF7U8f1h21HM9BnVd/fHMEHtibGTSwi2FHHAMNYgN7UKwyCcl06odHYmiDb0rwAWigAgZyfCGAI+SaMDuOFDePT+PedlcfimDp9ulFL/GrYJ0mK0+qwUBSQX0SzpSogvOf5YPpNKMKDdSjyw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575933376; 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=C87NySJVt4NgGAOfY9PkI0VWS5+apecfPyqIK+4d8OM=; b=dRb5oVP+RtSOgG0j2s0a6x6345W/NHoq0fpYP7XkPetcf3O6h2YdY6WXS3acEm/XIDaZp9Vy84WQ5YMPkth2hI5EjDoK6/AcVg89tFguHd0ftmJeSqWMKUh6Bb7yMlFgrDbwOuUEjVIiFsc26ej7oFu4oyeDorEH+di4toO0XSw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1575933376441237.2353450299005; Mon, 9 Dec 2019 15:16:16 -0800 (PST) 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-149-QUyBWC7zOEKCwxECmRNSqA-1; Mon, 09 Dec 2019 18:16:13 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 25C631083E83; Mon, 9 Dec 2019 23:16:07 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F2D1A5C3F8; Mon, 9 Dec 2019 23:16:06 +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 B07E8180880B; Mon, 9 Dec 2019 23:16:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xB9NG205008406 for ; Mon, 9 Dec 2019 18:16:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id EB94ADBF09; Mon, 9 Dec 2019 23:16:01 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E4E2FDBF14 for ; Mon, 9 Dec 2019 23:16:01 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (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 C989A90B969 for ; Mon, 9 Dec 2019 23:16:01 +0000 (UTC) Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-123-iVYv45TSO7O06pIXwY7NPA-1; Mon, 09 Dec 2019 18:15:58 -0500 Received: by mail-qk1-f195.google.com with SMTP id m188so14802452qkc.4; Mon, 09 Dec 2019 15:15:58 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c6:fe5:8243:c780:f073:3beb]) by smtp.gmail.com with ESMTPSA id e130sm352436qkb.72.2019.12.09.15.15.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 15:15:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575933375; 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=C87NySJVt4NgGAOfY9PkI0VWS5+apecfPyqIK+4d8OM=; b=i53O3qyk8Fk8cgAY094lG+He/A6foI/FEq5e7518SKNpv9qOMsOH9FADQfYapiF+Z9N0sc e0WO0GgBQj+bo2sbrTIO5YH6RsKAtQhz1eCpvjQPzMvQaC7qgO+sf5XKtpInP/owmUJvMQ nK+tQ2PkK5FeghFWlqU1WfHxJAfVpCg= 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=7ABpcYbUCiXh/QRwZk3EhfxOjoZkPSOPIfIIc0QubN4=; b=e1nEdnw4/TxGZHPKDY8SiKbVQT+Xo6G7/M4aGqrbtdUab6ucrpRzQ4N9F0aJTht8VA JP3XU8ITHe+m70BzuBfFiUfaO4MAjlrlpnJpPaAMXC3sLnUVAgnQBq5sqmrkLawjNV6v bAMBaNCJjGWVj6JOJEX/52FjHvlUkz/MU/vkZJTYCmnoQ6QWKG6KLQwuJM3MagI/a+PX 5tIYzEzUXsA0cHuhm/Fr1Udw3f3RzbnMMx6UW+5CYDNvYXbLL9efDy/akXEsU9XPyqDW RSbjLJMVjAZxD1/QxVKcGZpJ34TpfNU+BSHnWAqCycCKrznwoI83eUQVX/B3ZVWp4IAu n/eQ== X-Gm-Message-State: APjAAAUAOrlIM/WJbBqpY5lPKaNz1p/xS7fUQ9WPNAUFyCwWfmk1jcmC X2M7RXPthHhxJAh9zu0QwThp0qNtG7s= X-Google-Smtp-Source: APXvYqyi4hTogMq5St+++wPEFCLhO8G6YWlJwv8qxxBkLs70iHbpOtho1FlS6u/T8Xi7AVxW04S2dQ== X-Received: by 2002:a05:620a:b1c:: with SMTP id t28mr14948119qkg.360.1575933357551; Mon, 09 Dec 2019 15:15:57 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 9 Dec 2019 20:15:14 -0300 Message-Id: <20191209231531.2423222-10-danielhb413@gmail.com> In-Reply-To: <20191209231531.2423222-1-danielhb413@gmail.com> References: <20191209231531.2423222-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: iVYv45TSO7O06pIXwY7NPA-1 X-MC-Unique: QUyBWC7zOEKCwxECmRNSqA-1 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id xB9NG205008406 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , crobinso@redhat.com Subject: [libvirt] [PATCH v1 09/26] qemu_command: move qemuBuildSoundDevStr caps validation to qemu_domain 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.16 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Move QEMU caps validation of QEMU_CAPS_OBJECT_USB_AUDIO and QEMU_CAPS_DEVICE_ICH9_INTEL_HDA to a new function in qemu_domain.c, qemuDomainDeviceDefValidateSound(). This function is called by qemuDomainDeviceDefValidate() to validate the sound device in domain define time. qemuxml2xmltest.c was adjusted to add the now required caps for domain definition. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_command.c | 15 -------------- src/qemu/qemu_domain.c | 44 ++++++++++++++++++++++++++++++++++++++++- tests/qemuxml2xmltest.c | 4 +++- 3 files changed, 46 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 58d7aa697e..ef5f9c0582 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4280,30 +4280,15 @@ qemuBuildSoundDevStr(const virDomainDef *def, break; case VIR_DOMAIN_SOUND_MODEL_USB: model =3D "usb-audio"; - 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 NULL; - } break; case VIR_DOMAIN_SOUND_MODEL_ICH9: model =3D "ich9-intel-hda"; - 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 NULL; - } break; case VIR_DOMAIN_SOUND_MODEL_SB16: model =3D "sb16"; break; case VIR_DOMAIN_SOUND_MODEL_PCSPK: /* pc-speaker is handled separately= */ case VIR_DOMAIN_SOUND_MODEL_LAST: - virReportError(VIR_ERR_INTERNAL_ERROR, - _("sound card model '%s' is not supported by qemu"), - virDomainSoundModelTypeToString(sound->model)); return NULL; } =20 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 35ef2ae47d..0db96da3c2 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5224,6 +5224,45 @@ qemuDomainDeviceDefValidateNVRAM(virDomainNVRAMDefPt= r nvram, } =20 =20 +static int +qemuDomainDeviceDefValidateSound(virDomainSoundDefPtr sound, + virQEMUCapsPtr qemuCaps) +{ + 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; + } + + return 0; +} + + static int qemuDomainDefValidate(const virDomainDef *def, void *opaque) @@ -7669,8 +7708,11 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef= *dev, ret =3D qemuDomainDeviceDefValidateNVRAM(dev->data.nvram, def, qem= uCaps); break; =20 - case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_SOUND: + ret =3D qemuDomainDeviceDefValidateSound(dev->data.sound, qemuCaps= ); + break; + + case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_HUB: case VIR_DOMAIN_DEVICE_SHMEM: case VIR_DOMAIN_DEVICE_MEMORY: diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 3d4959a05c..2200d4a652 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -409,7 +409,9 @@ mymain(void) DO_TEST("net-midonet", NONE); DO_TEST("net-openvswitch", NONE); DO_TEST("sound", NONE); - DO_TEST("sound-device", NONE); + DO_TEST("sound-device", + QEMU_CAPS_DEVICE_ICH9_INTEL_HDA, + QEMU_CAPS_OBJECT_USB_AUDIO); DO_TEST("watchdog", NONE); DO_TEST("net-bandwidth", QEMU_CAPS_DEVICE_VGA); DO_TEST("net-bandwidth2", QEMU_CAPS_DEVICE_VGA); --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list