From nobody Tue Feb 10 07:39:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1616169565; cv=none; d=zohomail.com; s=zohoarc; b=Xu0fobEOdj5J8Lxze5fjfyBqxHl8Rx2gncbxQGMiBQxVj3ZJuDFslCpfvUm/poc5nWFsst4Ep5lA7IBnAEfXWdJi0A70CT0TiV2qWJ33/p0JBHuAyefGOrRy71kWKoknuAFidRC/turkEUcm9/1DBiM9lZOy7gq1OqIqc4Fz68k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169565; 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=oKl5l/67bDRZbL5+ZXVr9XddkUHE9L9O5f3lkpmT1Vo=; b=S6ktG7ynNvneRhBfiwsz9Ufj524MtQOpSbRRUURGDQxRHjnvijP4askBqT9LlxXDJFvQhx5fTtSHzYHDuSX6dAfmsR68w8ozkmAbXvgeuw3v5QjJi9E5TebjXyXOwMyrcyOmX7tatM7jIlFatmmb8CjxU1dZ6tpAQHYd62qxmzM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1616169565411520.1492021573306; Fri, 19 Mar 2021 08:59:25 -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-338-LErpy-AjM9OdV98pWzSJ1Q-1; Fri, 19 Mar 2021 11:59:19 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 89181185FFCF; Fri, 19 Mar 2021 15:59:14 +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 5C1621A353; Fri, 19 Mar 2021 15:59:14 +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 119D250041; Fri, 19 Mar 2021 15:59:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFxCk9007208 for ; Fri, 19 Mar 2021 11:59:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id DCB141F048; Fri, 19 Mar 2021 15:59:12 +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 8EB2C1F04C; Fri, 19 Mar 2021 15:59:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169564; 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=oKl5l/67bDRZbL5+ZXVr9XddkUHE9L9O5f3lkpmT1Vo=; b=h0xctBpmF1MOZQGuFoH6zINPXvxryPp016+XZnLlkeP3kV13Lh3JW95mOD6ehopLShknJT +km9Bf9BpYjgxn503v6KGCaDXu7ujF/0+/amupYXnJJHbHkFxQyD7jl5hqDheyKMPm7oDd mqNsYEGYopeGbAF7v/sN7CvpSYI4NAo= X-MC-Unique: LErpy-AjM9OdV98pWzSJ1Q-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 32/51] domain_conf: Use virXMLPropTristateXXX in virDomainAudioCommonParse Date: Fri, 19 Mar 2021 16:57:29 +0100 Message-Id: <20210319155748.680146-33-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.84 on 10.5.11.23 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 d78d09a4b9..dff554874f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13716,8 +13716,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; @@ -13726,21 +13724,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