From nobody Mon Feb 9 23:00:58 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=1616054552; cv=none; d=zohomail.com; s=zohoarc; b=n2sLe7+u+RHyva0HiSFrp3YVLTJZeIXskL+LXocbK8R4MfeAIZc+EI38EOBkM/TVYWyue1qeHqK47LBGds92a1LwU81lY+hkjo1mnQYnk1uWOTNhH1yRFcDk35gKGHEN3feJU6pHHhgWQZxLXN+uklDGX3DJyw6gZpuZrY5P5Wc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616054552; 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=yu3vyjE+M8cQ4m/Hamr70/hIcevBVXOnLfTMiyt8quw=; b=NJL7dxqmEmdSdiCUPdWvTvxASQTK4KeQ28nOo2BlgsvdzSrz5AnBYB6N7tS1P6fB6IsdGGpFIAUlCNTJ0Jqvh8hM7AxA7RHYkCdAt4vigFXql5BHMTVWXjNr2anAU9RM4n/zO+gs5L1FrTmpDi3gF5kYRprlXP+Z8A1E1Ez96A8= 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 1616054552639570.8179519901166; Thu, 18 Mar 2021 01:02:32 -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-272-wF6CEHC7O36je2OCNOD0Xg-1; Thu, 18 Mar 2021 04:02:29 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C296210866C0; Thu, 18 Mar 2021 08:02:23 +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 9A9F35D9D3; Thu, 18 Mar 2021 08:02:23 +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 477E6180B451; Thu, 18 Mar 2021 08:02:23 +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 12I82LTb028938 for ; Thu, 18 Mar 2021 04:02:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id A4D8E66A05; Thu, 18 Mar 2021 08:02:21 +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 DEC016362B; Thu, 18 Mar 2021 08:02:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616054551; 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=yu3vyjE+M8cQ4m/Hamr70/hIcevBVXOnLfTMiyt8quw=; b=RIPXEX6GWW2IBC/D4vYDI3AVT0GTBjgckcJ+mr+5STXNeNDcGuvlPMTiRmqfP3nQm7HjfC snqRtXQ62Nh0E+JWKjD7ZGpOnsWmEZwr4RYlDXFTznWE+nW2XqrA6Tcj/CA6uEAOkK7DKg G4xv/6z7UdGw/HRC6WlNY1f6w1AlpLQ= X-MC-Unique: wF6CEHC7O36je2OCNOD0Xg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 26/38] domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainMemoryDefParseXML Date: Thu, 18 Mar 2021 09:01:05 +0100 Message-Id: <20210318080117.70255-27-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.79 on 10.5.11.14 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 | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c020bf9124..d4ca60f98c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15764,16 +15764,8 @@ virDomainMemoryDefParseXML(virDomainXMLOptionPtr x= mlopt, } VIR_FREE(tmp); =20 - if ((tmp =3D virXMLPropString(memdevNode, "discard"))) { - if ((val =3D virTristateBoolTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid discard value '%s'"), tmp); - goto error; - } - - def->discard =3D val; - } - VIR_FREE(tmp); + if (virXMLPropYesNo(memdevNode, "discard", &def->discard) < 0) + goto error; =20 /* Extract NVDIMM UUID. */ if (def->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_NVDIMM && --=20 2.26.2