From nobody Tue Feb 10 17:08:30 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=1616169630; cv=none; d=zohomail.com; s=zohoarc; b=oGJhD100pa+p6YQDrqVlF11ehbRcWHlacQKRPXwHQamOrzuJ9kbqgK3hPXlF9NShHGgPk47ccsIx/SE0TRxjIJCa0MdPe9fDpp5MEhgBHEQRggaz/OqqJEyxz5gHkobQYf7Da2kMztOM91qAUA4WRrNvKvVuxhgMewat1sr9Zpc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169630; 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=OEGVo8ss4eItIm+kyXLZPg5tThF0Y2sXFgKdqYf9AFg=; b=UJPHYQ7l6n5wj+M/gi6FXLw9M52Ut0LoopI1zjXjFHYtZFrG4op5uM/yTkOtkgYqqMQmk15LqSt+bl7OzPkKt2p3lRAPmnPA5nar+35CeE0NG4iI1mm2b7OQtSgDp4xXGvtp5ejOKslS4l/C4k0AFqmuQvbQRHdUDZKbMeakep4= 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 161616963091656.531181415139145; Fri, 19 Mar 2021 09:00:30 -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-568-Z83VNn3tN_aNh_MLtcg28g-1; Fri, 19 Mar 2021 12:00:25 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D49FF10866D0; Fri, 19 Mar 2021 16:00:16 +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 9F50860871; Fri, 19 Mar 2021 16:00:16 +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 4692450042; Fri, 19 Mar 2021 16:00:16 +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 12JG06GG007529 for ; Fri, 19 Mar 2021 12:00:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id E9D6F1F04C; Fri, 19 Mar 2021 16:00:05 +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 225E81A353; Fri, 19 Mar 2021 16:00:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169628; 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=OEGVo8ss4eItIm+kyXLZPg5tThF0Y2sXFgKdqYf9AFg=; b=jO8IZn/OihH9jC4nIJQR+RBDhKtTC+RgcgCGYEqy4KuoUVu6twfVeqGmyarxJ/6emNWH+P 1jWD2RlG7KFmLp4xQwGqAdz/QsUwRu4Bx1gxY0yC3j06//hfLpvM+n17vwztOjR7tWJANQ 5IlfhvYIt4oLirfTr59KqKTTgzcAmr8= X-MC-Unique: Z83VNn3tN_aNh_MLtcg28g-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 40/51] domain_conf: Use virXMLPropTristateXXX in virDomainIOMMUDefParseXML Date: Fri, 19 Mar 2021 16:57:37 +0100 Message-Id: <20210319155748.680146-41-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.79 on 10.5.11.13 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 | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0b009bb237..c7d2e86dfe 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15776,40 +15776,17 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, iommu->model =3D val; =20 if ((driver =3D virXPathNode("./driver", ctxt))) { - VIR_FREE(tmp); - if ((tmp =3D virXMLPropString(driver, "intremap"))) { - if ((val =3D virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_XML_ERROR, _("unknown intremap valu= e: %s"), tmp); - return NULL; - } - iommu->intremap =3D val; - } + if (virXMLPropTristateSwitch(driver, "intremap", false, &iommu->in= tremap) < 0) + return NULL; =20 - VIR_FREE(tmp); - if ((tmp =3D virXMLPropString(driver, "caching_mode"))) { - if ((val =3D virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_XML_ERROR, _("unknown caching_mode = value: %s"), tmp); - return NULL; - } - iommu->caching_mode =3D val; - } - VIR_FREE(tmp); - if ((tmp =3D virXMLPropString(driver, "iotlb"))) { - if ((val =3D virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_XML_ERROR, _("unknown iotlb value: = %s"), tmp); - return NULL; - } - iommu->iotlb =3D val; - } + if (virXMLPropTristateSwitch(driver, "caching_mode", false, &iommu= ->caching_mode) < 0) + return NULL; =20 - VIR_FREE(tmp); - if ((tmp =3D virXMLPropString(driver, "eim"))) { - if ((val =3D virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_XML_ERROR, _("unknown eim value: %s= "), tmp); - return NULL; - } - iommu->eim =3D val; - } + if (virXMLPropTristateSwitch(driver, "iotlb", false, &iommu->iotlb= ) < 0) + return NULL; + + if (virXMLPropTristateSwitch(driver, "eim", false, &iommu->eim) < = 0) + return NULL; =20 VIR_FREE(tmp); if ((tmp =3D virXMLPropString(driver, "aw_bits"))) { --=20 2.26.2