From nobody Tue May 7 05:36:27 2024 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=1566376664; cv=none; d=zoho.com; s=zohoarc; b=Jdj57SvLvqm4x0QVWxwHUju7g64ZQtAtgsNUHtdAKSfG0a79uXS4CgOWV5bjFhUM642Yx2xVffPas6O4bU7YbUNVBFBiIvqu+TNa9WqKHlPZnnk3wiEzoMXIVsmTdvNxMQXZJJxqn/pvL/z8ktJzKZsgC7dlZMW9K4hqIbnLHmU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566376664; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=B7WxWd8EwG96QmD1t5DfGpRd5Pt43LIgqTP05bLCWkI=; b=L6YHaTdBnu/GBGZouXoXV1UzlN6Ji91Dmea/cTFo1/g+TRXWJXsfEuYwCKKgBgMrKJUem6pEhZRhGqDeice4Hy7rh2KsXtZAzugkU8aVfoTvSWhPMeUc/xR2EEpfVjNcPCpwa6E64PfAClMgV+Uu9uCR96zfFng2ktY2h3iREl4= 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 1566376664453851.6086124086354; Wed, 21 Aug 2019 01:37:44 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 649E68003E7; Wed, 21 Aug 2019 08:37:42 +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 E1B875C1D6; Wed, 21 Aug 2019 08:37:41 +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 969BF24F30; Wed, 21 Aug 2019 08:37:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7L8bctR029622 for ; Wed, 21 Aug 2019 04:37:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3562D197E6; Wed, 21 Aug 2019 08:37:38 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1B415B807 for ; Wed, 21 Aug 2019 08:37:34 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Wed, 21 Aug 2019 10:37:33 +0200 Message-Id: <76cd67086dd6b6a0764641c2ca55ae92451555db.1566376651.git.jtomko@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] xml: namespaces: use uri instead of href 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Wed, 21 Aug 2019 08:37:43 +0000 (UTC) Store the namespace URI as const char*, instead of in a function. Suggested-by: Jiri Denemark Signed-off-by: J=C3=A1n Tomko Reviewed-by: Jiri Denemark --- src/bhyve/bhyve_domain.c | 11 ++--------- src/lxc/lxc_domain.c | 9 +-------- src/network/bridge_driver.c | 11 +---------- src/qemu/qemu_domain.c | 10 +--------- src/storage/storage_backend_fs.c | 9 +-------- src/storage/storage_backend_rbd.c | 11 +---------- src/test/test_driver.c | 11 ++--------- src/util/virxml.c | 6 +++--- src/util/virxml.h | 2 +- src/vmx/vmx.c | 8 +------- 10 files changed, 14 insertions(+), 74 deletions(-) diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index ea4bd54969..ed281d7c68 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -31,8 +31,6 @@ =20 VIR_LOG_INIT("bhyve.bhyve_domain"); =20 -#define BHYVE_NAMESPACE_HREF "http://libvirt.org/schemas/domain/bhyve/1.0" - static void * bhyveDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED) { @@ -258,16 +256,11 @@ bhyveDomainDefNamespaceFormatXML(virBufferPtr buf, return 0; } =20 -static const char * -bhyveDomainDefNamespaceHref(void) -{ - return BHYVE_NAMESPACE_HREF; -} - virXMLNamespace virBhyveDriverDomainXMLNamespace =3D { .parse =3D bhyveDomainDefNamespaceParse, .free =3D bhyveDomainDefNamespaceFree, .format =3D bhyveDomainDefNamespaceFormatXML, .prefix =3D "bhyve", - .href =3D bhyveDomainDefNamespaceHref, + .uri =3D "http://libvirt.org/schemas/domain/bhyve/1.0", + }; diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index 00362e4c7f..c4360f25f6 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -34,7 +34,6 @@ #include "virinitctl.h" =20 #define VIR_FROM_THIS VIR_FROM_LXC -#define LXC_NAMESPACE_HREF "http://libvirt.org/schemas/domain/lxc/1.0" =20 VIR_ENUM_IMPL(virLXCDomainJob, LXC_JOB_LAST, @@ -302,19 +301,13 @@ lxcDomainDefNamespaceFormatXML(virBufferPtr buf, return 0; } =20 -static const char * -lxcDomainDefNamespaceHref(void) -{ - return LXC_NAMESPACE_HREF; -} - =20 virXMLNamespace virLXCDriverDomainXMLNamespace =3D { .parse =3D lxcDomainDefNamespaceParse, .free =3D lxcDomainDefNamespaceFree, .format =3D lxcDomainDefNamespaceFormatXML, .prefix =3D "lxc", - .href =3D lxcDomainDefNamespaceHref, + .uri =3D "http://libvirt.org/schemas/domain/lxc/1.0", }; =20 =20 diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index dd4f111cc0..86e2035b85 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -83,8 +83,6 @@ =20 VIR_LOG_INIT("network.bridge_driver"); =20 -#define DNSMASQ_NAMESPACE_HREF "http://libvirt.org/schemas/network/dnsmasq= /1.0" - static virNetworkDriverStatePtr network_driver; =20 =20 @@ -231,19 +229,12 @@ networkDnsmasqDefNamespaceFormatXML(virBufferPtr buf, } =20 =20 -static const char * -networkDnsmasqDefNamespaceHref(void) -{ - return DNSMASQ_NAMESPACE_HREF; -} - - virXMLNamespace networkDnsmasqXMLNamespace =3D { .parse =3D networkDnsmasqDefNamespaceParse, .free =3D networkDnsmasqDefNamespaceFree, .format =3D networkDnsmasqDefNamespaceFormatXML, .prefix =3D "dnsmasq", - .href =3D networkDnsmasqDefNamespaceHref, + .uri =3D "http://libvirt.org/schemas/network/dnsmasq/1.0", }; =20 =20 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6d770d3c13..8a3755c6fe 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -81,8 +81,6 @@ =20 VIR_LOG_INIT("qemu.qemu_domain"); =20 -#define QEMU_NAMESPACE_HREF "http://libvirt.org/schemas/domain/qemu/1.0" - VIR_ENUM_IMPL(qemuDomainJob, QEMU_JOB_LAST, "none", @@ -3713,19 +3711,13 @@ qemuDomainDefNamespaceFormatXML(virBufferPtr buf, return 0; } =20 -static const char * -qemuDomainDefNamespaceHref(void) -{ - return QEMU_NAMESPACE_HREF; -} - =20 virXMLNamespace virQEMUDriverDomainXMLNamespace =3D { .parse =3D qemuDomainDefNamespaceParse, .free =3D qemuDomainDefNamespaceFree, .format =3D qemuDomainDefNamespaceFormatXML, .prefix =3D "qemu", - .href =3D qemuDomainDefNamespaceHref, + .uri =3D "http://libvirt.org/schemas/domain/qemu/1.0", }; =20 =20 diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend= _fs.c index d947beac2c..d793ac19e8 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -528,7 +528,6 @@ virStorageBackendFileSystemBuild(virStoragePoolObjPtr p= ool, =20 #if WITH_STORAGE_FS =20 -# define STORAGE_POOL_FS_NAMESPACE_HREF "http://libvirt.org/schemas/storag= epool/fs/1.0" =20 /* Backend XML Namespace handling for fs or netfs specific mount options to * be added to the mount -o {options_list} command line that are not other= wise @@ -624,12 +623,6 @@ virStoragePoolDefFSNamespaceFormatXML(virBufferPtr buf, } =20 =20 -static const char * -virStoragePoolDefFSNamespaceHref(void) -{ - return STORAGE_POOL_FS_NAMESPACE_HREF; -} - #endif /* WITH_STORAGE_FS */ =20 =20 @@ -697,7 +690,7 @@ static virXMLNamespace virStoragePoolFSXMLNamespace =3D= { .free =3D virStoragePoolDefFSNamespaceFree, .format =3D virStoragePoolDefFSNamespaceFormatXML, .prefix =3D "fs", - .href =3D virStoragePoolDefFSNamespaceHref, + .uri =3D "http://libvirt.org/schemas/storagepool/fs/1.0", }; #endif /* WITH_STORAGE_FS */ =20 diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backen= d_rbd.c index 22caa189d7..c4781debd8 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -58,8 +58,6 @@ struct _virStoragePoolRBDConfigOptionsDef { char **values; }; =20 -#define STORAGE_POOL_RBD_NAMESPACE_HREF "http://libvirt.org/schemas/storag= epool/rbd/1.0" - static void virStoragePoolDefRBDNamespaceFree(void *nsdata) { @@ -166,13 +164,6 @@ virStoragePoolDefRBDNamespaceFormatXML(virBufferPtr bu= f, } =20 =20 -static const char * -virStoragePoolDefRBDNamespaceHref(void) -{ - return STORAGE_POOL_RBD_NAMESPACE_HREF; -} - - static int virStorageBackendRBDRADOSConfSet(rados_t cluster, const char *option, @@ -1538,7 +1529,7 @@ static virXMLNamespace virStoragePoolRBDXMLNamespace = =3D { .free =3D virStoragePoolDefRBDNamespaceFree, .format =3D virStoragePoolDefRBDNamespaceFormatXML, .prefix =3D "rbd", - .href =3D virStoragePoolDefRBDNamespaceHref, + .uri =3D "http://libvirt.org/schemas/storagepool/rbd/1.0", }; =20 =20 diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 57d54c05b3..6a694d8b1f 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -167,8 +167,6 @@ testDriverDispose(void *obj) virObjectUnref(driver->eventState); } =20 -#define TEST_NAMESPACE_HREF "http://libvirt.org/schemas/domain/test/1.0" - typedef struct _testDomainNamespaceDef testDomainNamespaceDef; typedef testDomainNamespaceDef *testDomainNamespaceDefPtr; struct _testDomainNamespaceDef { @@ -180,12 +178,6 @@ struct _testDomainNamespaceDef { xmlNodePtr *snap_nodes; }; =20 -static const char* -testDomainDefNamespaceHref(void) -{ - return TEST_NAMESPACE_HREF; -} - static void testDomainDefNamespaceFree(void *data) { @@ -427,7 +419,8 @@ testDriverNew(void) .parse =3D testDomainDefNamespaceParse, .free =3D testDomainDefNamespaceFree, .prefix =3D "test", - .href =3D testDomainDefNamespaceHref, + .uri =3D "http://libvirt.org/schemas/domain/test/1.0", + }; virDomainDefParserConfig config =3D { .features =3D VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG | diff --git a/src/util/virxml.c b/src/util/virxml.c index 84b824f432..f9c117dd58 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1416,7 +1416,7 @@ void virXMLNamespaceFormatNS(virBufferPtr buf, virXMLNamespace const *ns) { - virBufferAsprintf(buf, " xmlns:%s=3D'%s'", ns->prefix, ns->href()); + virBufferAsprintf(buf, " xmlns:%s=3D'%s'", ns->prefix, ns->uri); } =20 =20 @@ -1426,10 +1426,10 @@ virXMLNamespaceRegister(xmlXPathContextPtr ctxt, { if (xmlXPathRegisterNs(ctxt, BAD_CAST ns->prefix, - BAD_CAST ns->href()) < 0) { + BAD_CAST ns->uri) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to register xml namespace '%s'"), - ns->href()); + ns->uri); return -1; } =20 diff --git a/src/util/virxml.h b/src/util/virxml.h index be2abd23f7..30cc895436 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -257,7 +257,7 @@ struct _virXMLNamespace { virXMLNamespaceFree free; virXMLNamespaceFormat format; const char *prefix; - virXMLNamespaceHref href; + const char *uri; }; typedef struct _virXMLNamespace virXMLNamespace; typedef virXMLNamespace *virXMLNamespacePtr; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index c4e90537f8..2cc0995783 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -597,18 +597,12 @@ virVMXDomainDefNamespaceFormatXML(virBufferPtr buf, v= oid *nsdata) return 0; } =20 -static const char * -virVMXDomainDefNamespaceHref(void) -{ - return "http://libvirt.org/schemas/domain/vmware/1.0"; -} - static virXMLNamespace virVMXDomainXMLNamespace =3D { .parse =3D NULL, .free =3D virVMXDomainDefNamespaceFree, .format =3D virVMXDomainDefNamespaceFormatXML, .prefix =3D "vmware", - .href =3D virVMXDomainDefNamespaceHref, + .uri =3D "http://libvirt.org/schemas/domain/vmware/1.0", }; =20 virDomainXMLOptionPtr --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list