From nobody Mon Feb 9 21:37:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616161362; cv=none; d=zohomail.com; s=zohoarc; b=KxcktUofUv8JHH8mMt/LbdIRherg2+MCqEr/LqZZwPx/OREMEhhZ1NWKW7g1FFIZC7RgZfM4cZKGJ/Y+v8wS0WJUt5ZGi9r2DcUfBphvg0ANI8SjI3sGQrW0G63Nsj8dz1Wm3AjDiP+RMafwJwloQvw6APBJinmjOn9OsaVLzuI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161362; 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=cAjlSKKyNH0kCCa9/OLrMUPAMF2opoQDBwHmFtyOnSg=; b=cNLcqII92lNel2ZzUsjpIFZVCbbSWLcNu2M57dY5OagxDW/pIVrS45oCEY5yTDL4hGyaZKRoi6arWEXQfnxfreJSscf/RkX/3nM6S4SaU+poKl1uJl8bvniHh1wprpILxGcY06eDyFzR93GYmUGcQk1h58hhi5T670l5LfIq8OQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1616161362100860.2214415516243; Fri, 19 Mar 2021 06:42:42 -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-487-qutn9Vo1MTKwGac5ti7iBg-1; Fri, 19 Mar 2021 09:42:39 -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 D8DDA80D6AC; Fri, 19 Mar 2021 13:42:32 +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 8BDB05DAA5; Fri, 19 Mar 2021 13:42:32 +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 4A0A55004C; Fri, 19 Mar 2021 13:42:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgSx8020540 for ; Fri, 19 Mar 2021 09:42:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id E32BD179B3; Fri, 19 Mar 2021 13:42:28 +0000 (UTC) Received: from work.redhat.com (ovpn-112-175.ams2.redhat.com [10.36.112.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 320F64F3C6; Fri, 19 Mar 2021 13:42:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161361; 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=cAjlSKKyNH0kCCa9/OLrMUPAMF2opoQDBwHmFtyOnSg=; b=VGqOSJyp3bfwaqdkWB21F5RRvSgm+nDKX5mWj4fg4j9IlNia8XvpwNskm3tZOLScwS8n3k XfIqI4qX7q0eLYdjtogxFsR6NfQ+FRm8WyV8mucXlX/iIG/gy6s3JDNNIzZi6zyFR5f0AU 5VsSt8cThXs+4W92fL4xRgTvv31iRVI= X-MC-Unique: qutn9Vo1MTKwGac5ti7iBg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 32/51] domain_conf: Use virXMLPropTristateXXX in virDomainAudioCommonParse Date: Fri, 19 Mar 2021 14:40:46 +0100 Message-Id: <20210319134105.442774-33-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: Tim Wiederhake --- src/conf/domain_conf.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8f906e455d..f8793237d4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13717,8 +13717,6 @@ virDomainAudioCommonParse(virDomainAudioIOCommonPtr= def, xmlNodePtr node, xmlXPathContextPtr ctxt) { - g_autofree char *mixingEngine =3D virXMLPropString(node, "mixingEngine= "); - g_autofree char *fixedSettings =3D virXMLPropString(node, "fixedSettin= gs"); g_autofree char *voices =3D virXMLPropString(node, "voices"); g_autofree char *bufferLength =3D virXMLPropString(node, "bufferLength= "); xmlNodePtr settings; @@ -13727,21 +13725,11 @@ virDomainAudioCommonParse(virDomainAudioIOCommonP= tr def, ctxt->node =3D node; settings =3D virXPathNode("./settings", ctxt); =20 - if (mixingEngine && - ((def->mixingEngine =3D - virTristateBoolTypeFromString(mixingEngine)) <=3D 0)) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown 'mixingEngine' value '%s'"), mixingEngin= e); + if (virXMLPropTristateBool(node, "mixingEngine", false, &def->mixingEn= gine) < 0) return -1; - } =20 - if (fixedSettings && - ((def->fixedSettings =3D - virTristateBoolTypeFromString(fixedSettings)) <=3D 0)) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown 'fixedSettings' value '%s'"), fixedSetti= ngs); + if (virXMLPropTristateBool(node, "fixedSettings", false, &def->fixedSe= ttings) < 0) return -1; - } =20 if (def->fixedSettings =3D=3D VIR_TRISTATE_BOOL_YES && def->mixingEngine !=3D VIR_TRISTATE_BOOL_YES) { --=20 2.26.2