From nobody Mon Feb 9 11:31:55 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=1628171937; cv=none; d=zohomail.com; s=zohoarc; b=QPnzNWjmXFvnYGRTwEiisHnNA5jgMNv7y543VrDkZNUqxknauA0JoMVWsVvPvearQxGDiED0dHNlpgiCXWuAXvQcd+M7j4w34+L3tw5UEoZ9s+p5v9GWbQH7cRpssnxjGlo9ag/Shy2vccqzmMmUAOoWCKeaIVR0R0NhfKgelww= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628171937; h=Content-Type:Content-Transfer-Encoding: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=050uGlFznncvaE7tt5vGDG4+ZfSgfTN90/yXXY4Sjco=; b=Uuq1Sxt5mHTBWMl+niDhEHG4T7bqxy60pFBmMBbDmlTJN3OU5Ne+EZbFidSovUhE+YyN76FYvitYBOomEj2ObQgl8Ei9JkDyZiROQDllk5kGB49ny34RfpAi//MFMchwHqBBjgnVkcQNBd1xzXqQIZMnaG/TJewMnQG5qcOZAGE= 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) 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 1628171937808548.306299613151; Thu, 5 Aug 2021 06:58: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-281-_Ks4WRWRPmaKlq7kYGEeCA-1; Thu, 05 Aug 2021 09:58:55 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D466F190D341; Thu, 5 Aug 2021 13:58:49 +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 891345C1D0; Thu, 5 Aug 2021 13:58: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 7D45A181A3ED; Thu, 5 Aug 2021 13:58:48 +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 175DuIpd014638 for ; Thu, 5 Aug 2021 09:56:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4C8347CD65; Thu, 5 Aug 2021 13:56:18 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id 409C87B9DA for ; Thu, 5 Aug 2021 13:56:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628171936; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=050uGlFznncvaE7tt5vGDG4+ZfSgfTN90/yXXY4Sjco=; b=KLZL+QEwlqu3uIBM06KpCcqrhsoD4wcciqF+AbcdsO0VoMQGwC/sQO1n5MEA5pQodJxA7D PruF3nbbRbDRmPkuZZhuEjQjzoWbnzsdLApQMKV/PiCq0Gb0CV6sO7YFWma9J4S8JzU5Gw yIudRj+93Wr1Z4hqaxARyhCL/IEgBvA= X-MC-Unique: _Ks4WRWRPmaKlq7kYGEeCA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH v2 2/5] conf: refactor virDomainResourceDefParse Date: Thu, 5 Aug 2021 15:56:06 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com 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.16 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) X-ZM-MESSAGEID: 1628171939756100002 Content-Type: text/plain; charset="utf-8" There is no need to error out for empty element as we can just simply ignore it. This allows to simplify the function and prepare it for new sub-elements of . It makes the element optional so we need to reflect the change in schema as well. Signed-off-by: Pavel Hrdina --- docs/schemas/domaincommon.rng | 8 +++++--- src/conf/domain_conf.c | 18 +++++++----------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 2442078969..9b669d9de5 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1172,9 +1172,11 @@ =20 - - - + + + + + =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 09da4ab952..de38dd7110 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17292,23 +17292,19 @@ virDomainResourceDefParse(xmlNodePtr node, { VIR_XPATH_NODE_AUTORESTORE(ctxt) virDomainResourceDef *def =3D NULL; + char *partition =3D NULL; =20 ctxt->node =3D node; =20 + partition =3D virXPathString("string(./partition)", ctxt); + + if (!partition) + return NULL; + def =3D g_new0(virDomainResourceDef, 1); - - /* Find out what type of virtualization to use */ - if (!(def->partition =3D virXPathString("string(./partition)", ctxt)))= { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("missing resource partition attribute")); - goto error; - } + def->partition =3D partition; =20 return def; - - error: - virDomainResourceDefFree(def); - return NULL; } =20 =20 --=20 2.31.1