From nobody Tue Feb 10 00:57:42 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=1616161326; cv=none; d=zohomail.com; s=zohoarc; b=Xp8NpQhqfMsJekwfbvWT4Yf1332zSlxeM8gJLFs4dBNqD6blFvg6xgDmgd/ElNP6TdTQgx9909rouXWd8DSfI+3GvTkG77Z0mqyfFFGpRM9FI6YdSLRBBBi2H6Cpy563/BeBEYUCNiqv2bJQBw8orR/vy6nz4advMmO9HmXyw4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161326; 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=ERDXL/a6JsVgO9XFIv9wtBdTt1WnuqdMDYhNdMH5EwM=; b=Qwpso4Mw+HiLpiGOMMmn8XsoVcmzJrvuA2huopBTYoY4sjVcNm8H0jlPQZvuAl6Bt48rNbWm80r90MhTVyXoi+H0mxRdsm0UM9d9VJ60lFCFnRfrSJCP/wUQxPIlLSf6Fcp4k2a47f08RojOWQUW8XkpIIq16Az3giu3m7/KxME= 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 1616161326866466.5056200341745; Fri, 19 Mar 2021 06:42:06 -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-467-vfOxq6soPi6QZvepxEusCA-1; Fri, 19 Mar 2021 09:41:49 -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 D0E9081620; Fri, 19 Mar 2021 13:41:42 +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 AC1A36085A; Fri, 19 Mar 2021 13:41:42 +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 5CE63180213D; Fri, 19 Mar 2021 13:41:42 +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 12JDfdvd019442 for ; Fri, 19 Mar 2021 09:41:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id ECE0A39A65; Fri, 19 Mar 2021 13:41:39 +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 3A6E763B8C; Fri, 19 Mar 2021 13:41:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161325; 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=ERDXL/a6JsVgO9XFIv9wtBdTt1WnuqdMDYhNdMH5EwM=; b=G9sdcuZr5abac71CmPPpzlhZfqPu4aOm0nlIJHH/GzbBRvPGgurLWrWqg/aRnNc89kJsAT bqVV6u8ofRpLyQVsFFDSdDD85mwDWEHQVR6SmB9Ptu4qlTAtxfIUptuhzWrzL7knSk8IBj 0P98OWpBEEuzmfzvqlodwwgy/fpalQM= X-MC-Unique: vfOxq6soPi6QZvepxEusCA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 20/51] domain_conf: Use virXMLPropTristateXXX in virDomainDiskSourceNetworkParse Date: Fri, 19 Mar 2021 14:40:34 +0100 Message-Id: <20210319134105.442774-21-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.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 | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 91dc00edad..0e9106b061 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8275,7 +8275,6 @@ 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; xmlNodePtr tmpnode; @@ -8299,12 +8298,8 @@ 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 (virXMLPropTristateBool(node, "tls", false, &src->haveTLS) < 0) + return -1; =20 if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) && (tlsCfg =3D virXMLPropString(node, "tlsFromConfig"))) { --=20 2.26.2