From nobody Sun Feb 8 22:21:42 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=1629196915; cv=none; d=zohomail.com; s=zohoarc; b=WitXeNx1Ji34UaAfPgwwANxnUw/YdOgfXtHVInFN13rTR2laYq6kK5n2+JDvbQCDJtSQtGF5zhBG9fIebH/tQqsTX/FJu9ZBhJRCfpyGMMVV4ANtmd64qUSJXsjIZ3PiEguj6CJMx16JeFUX29yIJKnYdJ6/JL8lDUqpI1S0meA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629196915; 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=MquQ19ABRVnxm2/b8PULTZN8uolamvVPCQFkXaFgDRw=; b=a2Td7YCAFN15rzxoh987WI7HwRZGjGtXPjx4EYqb7ZOa3ZXW2eVJrmYnOYPYK2dP/TupoLyXJ9kGVhdnrdX4f3mlFZbShm3jB1EChlOncl0soMR5LVbpWdOjgtjRegL0lmxI/hoCIBgHA50WIfMGnBZbwEyTOokGFZ2pn7nut8k= 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) 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 1629196915008825.5335835737721; Tue, 17 Aug 2021 03:41:55 -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-504-AZU5Jzw0PmyodQVSy3vh-A-1; Tue, 17 Aug 2021 06:41:52 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2ECBB344AF; Tue, 17 Aug 2021 10:41: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 1006B60C0F; Tue, 17 Aug 2021 10:41:47 +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 D0E0F181A3F0; Tue, 17 Aug 2021 10:41:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17HAcHMV002711 for ; Tue, 17 Aug 2021 06:38:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id E11AA5C232; Tue, 17 Aug 2021 10:38:17 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.222]) by smtp.corp.redhat.com (Postfix) with ESMTP id 60ED15C1D5 for ; Tue, 17 Aug 2021 10:38:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629196913; 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=MquQ19ABRVnxm2/b8PULTZN8uolamvVPCQFkXaFgDRw=; b=DmmbH4xSRi6tkbX0VxlEvtoH1u2z+/a65uZiCVzEC7ps9AvMmdtwMwjmo3Qg7RYUNVqIYD gFQF3PBpppP5ekGq75skGRJaH74VbNoL/jYWWiXzzEk/cyAJeSpF6UL+TjPwwXBsWYdV6x cU8qkd5x/ICcgEZcfP9W4TAToQ6bUrE= X-MC-Unique: AZU5Jzw0PmyodQVSy3vh-A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH v4 2/5] conf: refactor virDomainResourceDefParse Date: Tue, 17 Aug 2021 12:38:07 +0200 Message-Id: <77b53057c7f8e9a147e748bce2ed867d298f881f.1629196554.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.12 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: 1629196917244100001 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 Reviewed-by: Martin Kletzander --- 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 e9bdbbfd74..7dff6c8beb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17284,23 +17284,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