From nobody Tue Feb 10 07:39:09 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=1616169629; cv=none; d=zohomail.com; s=zohoarc; b=SkchB/eQtVls8AUL63Itb1cuv3ra86peBbLIcxggBPZwi1be4WwBa3v0AI4Wd3TIWX3lQ6JLFM52aKNUbyzcctSwuZ1Bsp5xm66/CNLTyI2dZdjgR2WBTJa4NwjuO42FZUb4DUAcpvLfYlGOviDC4Y7Q1ERUFScEFRHekjg/jFg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169629; 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=cgEkvjgOmZIKy4NKOJgc5eFJKZuouM0x8aKXPA9p9qU=; b=MyQLf5Em6sEh4mZewCTcS7D1diZRyz1EJIg/NXlYOhYreJQyoqZ9+ytO/pfJ8Ua9iecPN5wkBHL5nV4RG0tbHEtsS9Bb9zuMfIExQUGG4lm4qLMkXLYoa5X25Li8RZE8CgSxH4ZukiX9HYWwZqNR5sAurdIA/OsSWvnyXQCURss= 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 1616169629154740.3103957360047; Fri, 19 Mar 2021 09:00:29 -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-357-JmUK1LNlO4mUUACxPvYZ0Q-1; Fri, 19 Mar 2021 11:58:37 -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 76CBF83DD2A; Fri, 19 Mar 2021 15:58:31 +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 51325104254E; Fri, 19 Mar 2021 15:58:31 +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 111FD4A718; Fri, 19 Mar 2021 15:58:31 +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 12JFwMcC006507 for ; Fri, 19 Mar 2021 11:58:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7AD3B1C959; Fri, 19 Mar 2021 15:58:22 +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 C1A991A86F; Fri, 19 Mar 2021 15:58:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169626; 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=cgEkvjgOmZIKy4NKOJgc5eFJKZuouM0x8aKXPA9p9qU=; b=aHM1Oe/ZOdw+RqFRC7P6lBMSYcZS77TwNzdYfkTG3nZUc6f7C1xz7QjEAToSZKahLuKpnz d2/iPjEdQAM5WaoS57vT1DcMxQIC7uXn8LDuj3e+MXFbRRqG3JUewYZn8jRtGu80d9gXhx +y4l1a5Qfoc8CeEBmJGrK5AXKnTYL2g= X-MC-Unique: JmUK1LNlO4mUUACxPvYZ0Q-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 21/51] domain_conf: Use virXMLPropTristateXXX in virDomainDiskSourceNVMeParse Date: Fri, 19 Mar 2021 16:57:18 +0100 Message-Id: <20210319155748.680146-22-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.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 | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4fd4fabb3f..f2fb3c8dd5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8397,7 +8397,6 @@ virDomainDiskSourceNVMeParse(xmlNodePtr node, g_autoptr(virStorageSourceNVMeDef) nvme =3D NULL; g_autofree char *type =3D NULL; g_autofree char *namespc =3D NULL; - g_autofree char *managed =3D NULL; xmlNodePtr address; =20 nvme =3D g_new0(virStorageSourceNVMeDef, 1); @@ -8428,16 +8427,8 @@ virDomainDiskSourceNVMeParse(xmlNodePtr node, return -1; } =20 - if ((managed =3D virXMLPropString(node, "managed"))) { - int value; - if ((value =3D virTristateBoolTypeFromString(managed)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("malformed managed value '%s'"), - managed); - return -1; - } - nvme->managed =3D value; - } + if (virXMLPropTristateBool(node, "managed", false, &nvme->managed) < 0) + return -1; =20 if (!(address =3D virXPathNode("./address", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", --=20 2.26.2