From nobody Sun Feb 8 22:57:48 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1566342978; cv=none; d=zoho.com; s=zohoarc; b=dxwhxMcNHIKvA+yk2vjT3kINRbslrEdum/Zh6+9rrJUntG3O+T/fBRDE9j8ugCE6+rKwr1ZooYIBAnWmkV6WIcsyyFQQP3RqANN/j2eRL+/C8mx3Maj13e0oqdDGmbJsVlinn1ZnaWT/3+m8mWJiyfr2es3rVihYqUo0MFo33TA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566342978; 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:ARC-Authentication-Results; bh=82yTJ1CDhCQY2ezhPiLzg2gxXC1L1t9s1TOsKXb+a2U=; b=m6r6feaBS1/iVLMOJL5DoeaY+ZqK85gJq/ij3qzyZYmINpfxRksrgChD8uRn1Ia5rWX3m2lSrulohqvxnnIDZOuNtf1MMHzCSvS0swXOLQ5jXVDNeuCtLLCtlxyFRwJnCCJcgHT7ipsEeKIIBTalGt+8DHd9rbmZ9bRsw6b/ju0= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1566342978685793.9527256453301; Tue, 20 Aug 2019 16:16:18 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3E106308FBB1; Tue, 20 Aug 2019 23:16:17 +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 135992C8E3; Tue, 20 Aug 2019 23:16:17 +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 D3146180BAB9; Tue, 20 Aug 2019 23:16:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7KNFsQu013601 for ; Tue, 20 Aug 2019 19:15:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 923E42C8DC; Tue, 20 Aug 2019 23:15:54 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B5F760605 for ; Tue, 20 Aug 2019 23:15:53 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Wed, 21 Aug 2019 01:15:29 +0200 Message-Id: <5988d35c785de2f9732285517d2f9e54100a2c01.1566342869.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 07/21] conf: storage: use generic XML namespace types 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: , Content-Type: text/plain; charset="utf-8" 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 20 Aug 2019 23:16:17 +0000 (UTC) There is no need to copy and paste the same types pointing to void all over the place. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Jiri Denemark --- src/conf/storage_conf.c | 4 ++-- src/conf/storage_conf.h | 23 ++++------------------- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_rbd.c | 2 +- src/storage/storage_util.c | 2 +- src/storage/storage_util.h | 2 +- 6 files changed, 10 insertions(+), 25 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index a2b977989f..fb8a16a119 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -140,7 +140,7 @@ struct _virStoragePoolOptions { int defaultFormat; int lastFormat; =20 - virStoragePoolXMLNamespace ns; + virXMLNamespace ns; =20 virStoragePoolFormatToString formatToString; virStoragePoolFormatFromString formatFromString; @@ -341,7 +341,7 @@ virStoragePoolOptionsForPoolType(int type) */ int virStoragePoolOptionsPoolTypeSetXMLNamespace(int type, - virStoragePoolXMLNamespacePtr= ns) + virXMLNamespacePtr ns) { int ret =3D -1; virStoragePoolTypeInfoPtr backend =3D virStoragePoolTypeInfoLookup(typ= e); diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index f399ac6192..1f62803a9d 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -31,28 +31,13 @@ #include "storage_adapter_conf.h" #include "virautoclean.h" #include "virenum.h" +#include "virxml.h" + =20 -#include - -/* Various callbacks needed to parse/create Storage Pool XML's using - * a private namespace */ -typedef int (*virStoragePoolDefNamespaceParse)(xmlXPathContextPtr, void **= ); -typedef void (*virStoragePoolDefNamespaceFree)(void *); -typedef int (*virStoragePoolDefNamespaceXMLFormat)(virBufferPtr, void *); -typedef const char *(*virStoragePoolDefNamespaceHref)(void); - -typedef struct _virStoragePoolXMLNamespace virStoragePoolXMLNamespace; -typedef virStoragePoolXMLNamespace *virStoragePoolXMLNamespacePtr; -struct _virStoragePoolXMLNamespace { - virStoragePoolDefNamespaceParse parse; - virStoragePoolDefNamespaceFree free; - virStoragePoolDefNamespaceXMLFormat format; - virStoragePoolDefNamespaceHref href; -}; =20 int virStoragePoolOptionsPoolTypeSetXMLNamespace(int type, - virStoragePoolXMLNamespacePtr= ns); + virXMLNamespacePtr ns); =20 int virStoragePoolOptionsFormatPool(virBufferPtr buf, @@ -277,7 +262,7 @@ struct _virStoragePoolDef { =20 /* Pool backend specific XML namespace data */ void *namespaceData; - virStoragePoolXMLNamespace ns; + virXMLNamespace ns; }; =20 typedef struct _virStoragePoolSourceList virStoragePoolSourceList; diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend= _fs.c index ae4e9a03a3..d575b75449 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -701,7 +701,7 @@ virStorageBackend virStorageBackendNetFileSystem =3D { .wipeVol =3D virStorageBackendVolWipeLocal, }; =20 -static virStoragePoolXMLNamespace virStoragePoolFSXMLNamespace =3D { +static virXMLNamespace virStoragePoolFSXMLNamespace =3D { .parse =3D virStoragePoolDefFSNamespaceParse, .free =3D virStoragePoolDefFSNamespaceFree, .format =3D virStoragePoolDefFSNamespaceFormatXML, diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backen= d_rbd.c index f3104ba310..e490c690f5 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -1542,7 +1542,7 @@ virStorageBackend virStorageBackendRBD =3D { }; =20 =20 -static virStoragePoolXMLNamespace virStoragePoolRBDXMLNamespace =3D { +static virXMLNamespace virStoragePoolRBDXMLNamespace =3D { .parse =3D virStoragePoolDefRBDNamespaceParse, .free =3D virStoragePoolDefRBDNamespaceFree, .format =3D virStoragePoolDefRBDNamespaceFormatXML, diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 62f857f9ea..3dc5ad2969 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -92,7 +92,7 @@ VIR_LOG_INIT("storage.storage_util"); */ int virStorageBackendNamespaceInit(int poolType, - virStoragePoolXMLNamespacePtr xmlns) + virXMLNamespacePtr xmlns) { return virStoragePoolOptionsPoolTypeSetXMLNamespace(poolType, xmlns); } diff --git a/src/storage/storage_util.h b/src/storage/storage_util.h index 6df5928d9b..705e23631d 100644 --- a/src/storage/storage_util.h +++ b/src/storage/storage_util.h @@ -36,7 +36,7 @@ struct _virStoragePoolFSMountOptionsDef { =20 int virStorageBackendNamespaceInit(int poolType, - virStoragePoolXMLNamespacePtr xmlns); + virXMLNamespacePtr xmlns); =20 =20 /* File creation/cloning functions used for cloning between backends */ --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list