From nobody Wed May 14 16:52:43 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1522324322030632.6967092311631; Thu, 29 Mar 2018 04:52:02 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 1F8D27FD42; Thu, 29 Mar 2018 11:51:30 +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 DE54D5D72E; Thu, 29 Mar 2018 11:51:29 +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 9E3C54CA9F; Thu, 29 Mar 2018 11:51:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2TBpINp016287 for ; Thu, 29 Mar 2018 07:51:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id BDA7C1102E2D; Thu, 29 Mar 2018 11:51:18 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 478A81102E2B; Thu, 29 Mar 2018 11:51:18 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 29 Mar 2018 13:51:00 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 03/14] conf: Don't require 'def' in virDomainDiskDefParse 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 29 Mar 2018 11:51:30 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" In some use cases (mostly in tests) it is not required to check the seclabel definition validity. Add possibility to call virDomainDiskDefParse without the domain definition. Signed-off-by: Peter Krempa --- src/conf/domain_conf.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e2bad48cc8..ac3a3d9966 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15873,6 +15873,8 @@ virDomainDiskDefParse(const char *xmlStr, xmlDocPtr xml; xmlXPathContextPtr ctxt =3D NULL; virDomainDiskDefPtr disk =3D NULL; + virSecurityLabelDefPtr *seclabels =3D NULL; + size_t nseclabels =3D 0; if (!(xml =3D virXMLParseStringCtxt(xmlStr, _("(disk_definition)"), &c= txt))) goto cleanup; @@ -15884,10 +15886,13 @@ virDomainDiskDefParse(const char *xmlStr, goto cleanup; } + if (def) { + seclabels =3D def->seclabels; + nseclabels =3D def->nseclabels; + } + disk =3D virDomainDiskDefParseXML(xmlopt, ctxt->node, ctxt, - NULL, def->seclabels, - def->nseclabels, - flags); + NULL, seclabels, nseclabels, flags); cleanup: xmlFreeDoc(xml); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list