From nobody Mon Feb 9 11:30:07 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=1616054521; cv=none; d=zohomail.com; s=zohoarc; b=Iy3ezTah260x3VVjMkSl4MgrjE7D3YZ8KALLq/dUsM8ShQG2WTrtdqZ/9s6hEvQPOeezkvnNltrhP4fZgztiSnBKv6yEwMLWYMvMrrExC8hvRwA75iRIxNdgmIK65PicKAIDXimY5JkiLYyGfdUifYdDYdRFvOfFXW62bwhhqqY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616054521; 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=pI0AycasS9urG/Jnqxr38lBJapwabKKUFOzmNuHRKg0=; b=Fb1K0MBSa9NK4nvNnn4l2p2RUQPPtwJykZHmfuWbq64c/je+A4yHKjv/EPNHb29yCLTI0KuAVm8hXekaDU4Kijy2BWd+bmGxbSvaNb+4aoMlwBhFHlgV2p4RRmXAEJvGK4WyrulorShdISeg/k/5xFndi2WZAL7lIty4ZBttCX0= 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 161605452156298.83694842139084; Thu, 18 Mar 2021 01:02:01 -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-359-cKzYsqgTOcCnKly-E_zvgw-1; Thu, 18 Mar 2021 04:01:57 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 546318015BD; Thu, 18 Mar 2021 08:01:51 +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 25EE710027A5; Thu, 18 Mar 2021 08:01:51 +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 B3D881800662; Thu, 18 Mar 2021 08:01:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12I81UoV028184 for ; Thu, 18 Mar 2021 04:01:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 994F166A16; Thu, 18 Mar 2021 08:01:30 +0000 (UTC) Received: from work.redhat.com (ovpn-112-180.ams2.redhat.com [10.36.112.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF544669F2; Thu, 18 Mar 2021 08:01:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616054520; 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=pI0AycasS9urG/Jnqxr38lBJapwabKKUFOzmNuHRKg0=; b=MlszcHsLs0OQrbWNgMMm90E8Wt5KSSuwICS8dbM2jMqidwLfGHVBO2cHySjVfsrBPB/xvf hCGxYcKXqklzoYm3DKInNHEuZKpQcT7e0RKukDTcjelpCUWhf7se0NT/12CR9mqnfiM4Ay fdiSCn9GB08PNS9w6N1DvyRGNeK4Ptk= X-MC-Unique: cKzYsqgTOcCnKly-E_zvgw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 07/38] domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainDiskSourceNetworkParse Date: Thu, 18 Mar 2021 09:00:46 +0100 Message-Id: <20210318080117.70255-8-twiederh@redhat.com> In-Reply-To: <20210318080117.70255-1-twiederh@redhat.com> References: <20210318080117.70255-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.22 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 | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e1b2baf621..55920e7a7d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8303,9 +8303,9 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, { int tlsCfgVal; g_autofree char *protocol =3D NULL; - g_autofree char *haveTLS =3D NULL; g_autofree char *tlsCfg =3D NULL; g_autofree char *sslverifystr =3D NULL; + virTristateBool haveTLS =3D VIR_TRISTATE_BOOL_ABSENT; xmlNodePtr tmpnode; =20 if (!(protocol =3D virXMLPropString(node, "protocol"))) { @@ -8327,12 +8327,9 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, return -1; } =20 - if ((haveTLS =3D virXMLPropString(node, "tls")) && - (src->haveTLS =3D virTristateBoolTypeFromString(haveTLS)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown disk source 'tls' setting '%s'"), haveTLS); - return -1; - } + if (virXMLPropYesNo(node, "tls", &haveTLS) < 0) + return -1; + src->haveTLS =3D haveTLS; =20 if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) && (tlsCfg =3D virXMLPropString(node, "tlsFromConfig"))) { --=20 2.26.2