From nobody Mon Feb 9 19:25:39 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=1620137291; cv=none; d=zohomail.com; s=zohoarc; b=VWUqKZbIqnMMlLmnTmZRc4iUU9K006a1dHiOvNr6UqoKsfiIC2SH7sG7z8tP56dT7HTrLwlybOy6jjwJWV/IJMiXvlBCqqFrOFPZltb720ThkYE//pS0hRzP/3z3U0pdCe12f2Qwh4EyED0Q+7TNYTcNS/Js64WTd+cZTEo2AZY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620137291; 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=Q+V44DQ5HBq2iFrQJ1M7k7p9wKWHtZoQTS23MTJNQeM=; b=TzgJ9jRHKrImvmHsVRHxxMpTsfUsVsc9JXL8qNuJkr9ogpUGLyjCzqz8c0m1HTs6c8MqpLaoYhZo1UNOinNdA7rOXmWFNFp/cq19to0AspyIDQtNLRer5oVI92r9iFaGYuZ5054CWJanL1jAQIzRxoeTXnesqok3LMVKYWQMGHg= 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 SMTP id 1620137291719447.2585163185481; Tue, 4 May 2021 07:08:11 -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-133-QFppy3GzPeSFyUGhN0pgQg-1; Tue, 04 May 2021 10:03:02 -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 E3C748042BD; Tue, 4 May 2021 14:02:49 +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 B7C2D1001901; Tue, 4 May 2021 14:02:49 +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 77B0155350; Tue, 4 May 2021 14:02:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 144E2iSB013135 for ; Tue, 4 May 2021 10:02:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4D34F190E8; Tue, 4 May 2021 14:02:44 +0000 (UTC) Received: from work.redhat.com (ovpn-115-86.ams2.redhat.com [10.36.115.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA27160C0F; Tue, 4 May 2021 14:02:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620136986; 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=Q+V44DQ5HBq2iFrQJ1M7k7p9wKWHtZoQTS23MTJNQeM=; b=GnqB4L1OA7yRwSBLV/8cmj1ei6iflwt+GhlTx5EkwgHqRH057x+/uopP0bCaEzHsFxfx2R 48IxGps+oNIxPpJbmRMzE4oG9UjwdHpcR/WIesTPNkyUwlwtx1rUh7/Fxuq5wVeq9j/bkV E0oTIpS75KmKI/5OOC0TegNP7pXnNfk= X-MC-Unique: QFppy3GzPeSFyUGhN0pgQg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 03/10] virDomainMemoryDefParseXML: Use virXMLProp* Date: Tue, 4 May 2021 16:02:28 +0200 Message-Id: <20210504140235.132300-4-twiederh@redhat.com> In-Reply-To: <20210504140235.132300-1-twiederh@redhat.com> References: <20210504140235.132300-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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 | 41 ++++++++--------------------------------- 1 file changed, 8 insertions(+), 33 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8930dc33ce..b8ac399f5c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15040,48 +15040,24 @@ virDomainMemoryDefParseXML(virDomainXMLOption *xm= lopt, VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr node; virDomainMemoryDef *def; - int val; g_autofree char *tmp =3D NULL; =20 def =3D g_new0(virDomainMemoryDef, 1); =20 ctxt->node =3D memdevNode; =20 - if (!(tmp =3D virXMLPropString(memdevNode, "model"))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing memory model")); + if (virXMLPropEnum(memdevNode, "model", virDomainMemoryModelTypeFromSt= ring, + VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO, + &def->model) < 0) goto error; - } =20 - if ((val =3D virDomainMemoryModelTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid memory model '%s'"), tmp); + if (virXMLPropEnum(memdevNode, "access", virDomainMemoryAccessTypeFrom= String, + VIR_XML_PROP_NONZERO, &def->access) < 0) goto error; - } - VIR_FREE(tmp); - def->model =3D val; - - if ((tmp =3D virXMLPropString(memdevNode, "access"))) { - if ((val =3D virDomainMemoryAccessTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid access mode '%s'"), tmp); - goto error; - } =20 - def->access =3D val; - } - VIR_FREE(tmp); - - 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", VIR_XML_PROP_NONE, + &def->discard) < 0) + goto error; =20 /* Extract NVDIMM UUID. */ if (def->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_NVDIMM && @@ -15094,7 +15070,6 @@ virDomainMemoryDefParseXML(virDomainXMLOption *xmlo= pt, goto error; } } - VIR_FREE(tmp); =20 /* source */ if ((node =3D virXPathNode("./source", ctxt)) && --=20 2.26.3