From nobody Mon Feb 9 12:43:16 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=1616161377; cv=none; d=zohomail.com; s=zohoarc; b=BN+TCbnZEJ/NinhEVhJyO0g4TTRbtSHajjbwNKBNq2yP5vhFd0ghO3PmSm4kARpLpyRYcYrr264wDupUv1us0ixL/7bF5PfJef4L4PFihPTEXMu/3wyiCAC3RtfDS0umGvoL/sP+OO4oPM5Vufj7beMtTKeyVqcNCuLVbyeF5mM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161377; 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=XvEVPdYiE0RoKQMj2v7kR29wCsReiocky7Re27aFOd0=; b=coQBHpqu07fje/on68zgpxFc7OyZ+mNloqmn49SZ0MN1cbmcayCqlDyPbzj7YXFIgas1M96zwE4ohKsyYc7O5yNubRfohSLRcDMufYWa4YoJxXJktyDjm9BoUFNii1xH6h0n8ffUM8iMFdCwpVoqD3UTkfoKBhWN+uxE+w3K4f0= 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 1616161377379211.51847744224597; Fri, 19 Mar 2021 06:42:57 -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-285-EkIGiCpBOVGCkpHExM7P0A-1; Fri, 19 Mar 2021 09:42:54 -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 1FB1C1013723; Fri, 19 Mar 2021 13:42:47 +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 F08355DAA5; Fri, 19 Mar 2021 13:42:46 +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 AC126180213D; Fri, 19 Mar 2021 13:42:46 +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 12JDggjH020656 for ; Fri, 19 Mar 2021 09:42:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 31AD659446; Fri, 19 Mar 2021 13:42:42 +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 766BB59442; Fri, 19 Mar 2021 13:42:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161376; 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=XvEVPdYiE0RoKQMj2v7kR29wCsReiocky7Re27aFOd0=; b=FtzjWAOIMnQZz+dcpCT/eAbh85a82UGKB6qT/ObfGmbaGVlPRdXz76z3fRwrdBXmqBslID 2NkIn0N4NobdkNhmxvZjT0Qri18ByChvOGlEXJ3ngoMCRrp1JMf0S8D7+HN1ejbsLm/+9/ m/xoI9Jc4IBEg3bG+MXSSWWBx+5uD5E= X-MC-Unique: EkIGiCpBOVGCkpHExM7P0A-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 39/51] domain_conf: Use virXMLPropTristateXXX in virDomainMemoryDefParseXML Date: Fri, 19 Mar 2021 14:40:53 +0100 Message-Id: <20210319134105.442774-40-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.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 ef1f930a96..3c69f3913a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15706,16 +15706,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 (virXMLPropTristateBool(memdevNode, "discard", false, &def->discard= ) < 0) + goto error; =20 /* Extract NVDIMM UUID. */ if (def->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_NVDIMM && --=20 2.26.2