From nobody Mon Feb 9 19:04:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1616161308; cv=none; d=zohomail.com; s=zohoarc; b=gvsehvZUBny1nY6T+nnmMTDqQCBiOVr9zhvqqzRJrsSm3ehe2cu/pNciHk5oNWvN8mS0ueZROJJd0qnc9NUIeUpqC1aBIoAmWdqeZo3MJx/EvxaqGa0DdilpoWxo1NAIQiIxHpR/PRjsqgaqOKwSqsptJUydmCfiOASNBqeShuk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161308; 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=YtRUpRv1SzDwzlm+kF39oJKnjwkJFcgSIuG7GpzmHjM=; b=amx2oKzR2H3GbuA2tT0DbNVJhtHnRwXaCTgxfGU0jYzCV0wQmHaOSi9Y8gc4Ic1nTeKz++dBji2X6n2GaNndojoVuf52pb0ZaGMcZWDAiGNyYc+XQ1kVkb1IOQt4YkYRAqIc6zm5AodbN2lzw7k9hOSSQHquFH9prx2knRvUbgQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1616161308539925.538521757967; Fri, 19 Mar 2021 06:41:48 -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-224-luwcRLVdOAayHSO2ci6D3A-1; Fri, 19 Mar 2021 09:41:45 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B8EF7190A7AF; Fri, 19 Mar 2021 13:41:39 +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 9138C2BFE2; Fri, 19 Mar 2021 13:41:39 +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 2A051180213A; Fri, 19 Mar 2021 13:41:39 +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 12JDfbSH019371 for ; Fri, 19 Mar 2021 09:41:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id D320C2BFE2; Fri, 19 Mar 2021 13:41:37 +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 26C944F3C6; Fri, 19 Mar 2021 13:41:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161307; 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=YtRUpRv1SzDwzlm+kF39oJKnjwkJFcgSIuG7GpzmHjM=; b=CkRNpu2knBWN0Uq1ZO6xAHS+qFS3vSvUnOp8A4fVIdk/mQpYvHJHkR3Qe+mXgiBGdfBRFN luHDjJq5wfrdV6jpAiO5V2yEKK9wnBRAoE7IAZhdbm/5mlII2YJtizECSHjhiXLV6AspZT j9ZqUynff+rcEfE+gxfwpYDwkFbKZuo= X-MC-Unique: luwcRLVdOAayHSO2ci6D3A-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 18/51] domain_conf: Use virXMLPropTristateXXX in virDomainVirtioOptionsParseXML Date: Fri, 19 Mar 2021 14:40:32 +0100 Message-Id: <20210319134105.442774-19-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.11 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 | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3ac041e3d2..c8411bdf40 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1591,9 +1591,7 @@ static int virDomainVirtioOptionsParseXML(xmlNodePtr driver, virDomainVirtioOptionsPtr *virtio) { - int val; virDomainVirtioOptionsPtr res; - g_autofree char *str =3D NULL; =20 if (*virtio || !driver) return 0; @@ -1602,34 +1600,14 @@ virDomainVirtioOptionsParseXML(xmlNodePtr driver, =20 res =3D *virtio; =20 - if ((str =3D virXMLPropString(driver, "iommu"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid iommu value")); - return -1; - } - res->iommu =3D val; - } - VIR_FREE(str); + if (virXMLPropTristateSwitch(driver, "iommu", false, &res->iommu) < 0) + return -1; =20 - if ((str =3D virXMLPropString(driver, "ats"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid ats value")); - return -1; - } - res->ats =3D val; - } - VIR_FREE(str); + if (virXMLPropTristateSwitch(driver, "ats", false, &res->ats) < 0) + return -1; =20 - if ((str =3D virXMLPropString(driver, "packed"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid packed value")); - return -1; - } - res->packed =3D val; - } + if (virXMLPropTristateSwitch(driver, "packed", false, &res->packed) < = 0) + return -1; =20 return 0; } --=20 2.26.2