From nobody Mon Feb 9 07:23: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=1616054713; cv=none; d=zohomail.com; s=zohoarc; b=GNhfWzo/LJRBFDKij52LiP4WTCSjoBr/q6EBP2FuWeoyYym3hLj6ATUbKVsxfF4WbMbcBFvZAFOE0DWPQwDjSLvA51NPY01ZweXQTIjlljRSczZfJuXQrltK14U8VxsYxjCck1SUqESj/Q0xT72OtG81ci4QNXI0BibuDAbhkKA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616054713; 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=tyLUn6LR3cf9IMjgUJlLRoJ6L7vhJIG9kpN5TKrxl04=; b=IIfXE9vE8SZW9sNtcVJ+5mf3IWBwf/rgCFaZtNBS8zUkhRTYNZHmULTVeR8KyoHQGuTGmoROwWYVM1iCQlq8NSMiy5tncftiKrtBraVMEi1sDuOnoGoJh1LxAnDtt/CUZGt5E5Mc50CME36VW/z64SscP6qM+XPNsOGnAP/RPc0= 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 1616054713969856.306307992884; Thu, 18 Mar 2021 01:05:13 -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-184-v4cA2TuVOnGTcwSZF7jZoA-1; Thu, 18 Mar 2021 04:02:00 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2D57A18C8C36; Thu, 18 Mar 2021 08:01:55 +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 031A61F041; Thu, 18 Mar 2021 08:01:55 +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 AFF08180C5A8; Thu, 18 Mar 2021 08:01:54 +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 12I81Vtc028191 for ; Thu, 18 Mar 2021 04:01:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id A68D466A05; Thu, 18 Mar 2021 08:01:31 +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 EBA52669F2; Thu, 18 Mar 2021 08:01:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616054713; 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=tyLUn6LR3cf9IMjgUJlLRoJ6L7vhJIG9kpN5TKrxl04=; b=IbH6i7kz1OuUxEsTfDalXrayy4zWhik1iYSBPl1E1CE3c8MW4MFEl6ZByy4iYqaFMrGEfX XD1OcGueikYTXCcZV6aWsECAxVuA/pWfb7anih8azJbwrS6eCME4zFY13j0xoI3AIiPcTm e6UHIhzXJTEXAuCQjGBkgWE4Q+hOxAI= X-MC-Unique: v4cA2TuVOnGTcwSZF7jZoA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 08/38] domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainDiskSourceNVMeParse Date: Thu, 18 Mar 2021 09:00:47 +0100 Message-Id: <20210318080117.70255-9-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.23 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, 4 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 55920e7a7d..e3e38ae30d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8428,7 +8428,7 @@ 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; + virTristateBool managed =3D VIR_TRISTATE_BOOL_ABSENT; xmlNodePtr address; =20 nvme =3D g_new0(virStorageSourceNVMeDef, 1); @@ -8459,14 +8459,9 @@ virDomainDiskSourceNVMeParse(xmlNodePtr node, return -1; } =20 - if ((managed =3D virXMLPropString(node, "managed"))) { - if ((nvme->managed =3D virTristateBoolTypeFromString(managed)) <= =3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("malformed managed value '%s'"), - managed); - return -1; - } - } + if (virXMLPropYesNo(node, "managed", &managed) < 0) + return -1; + nvme->managed =3D managed; =20 if (!(address =3D virXPathNode("./address", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", --=20 2.26.2