External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 05:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: domain: use virXMLNamespaceFormatNS

Browse Source 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Ján Tomko 2019-08-21 00:14:53 +02:00
parent ff94298fad
commit 56ecb33102
6 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bhyve/bhyve_domain.c
View File

@ -270,7 +270,7 @@ bhyveDomainDefNamespaceFormatXML(virBufferPtr buf,
static const char *
bhyveDomainDefNamespaceHref(void)
{
return "xmlns:bhyve='" BHYVE_NAMESPACE_HREF "'";
return BHYVE_NAMESPACE_HREF;
}
virXMLNamespace virBhyveDriverDomainXMLNamespace = {

4
src/conf/domain_conf.c
View File

@ -28313,8 +28313,8 @@ virDomainDefFormatInternal(virDomainDefPtr def,
virBufferAsprintf(buf, "<domain type='%s'", type);
if (!(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))
virBufferAsprintf(buf, " id='%d'", def->id);
if (def->namespaceData && def->ns.href)
virBufferAsprintf(buf, " %s", (def->ns.href)());
if (def->namespaceData && def->ns.format)
virXMLNamespaceFormatNS(buf, &def->ns);
virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2);

2
src/lxc/lxc_domain.c
View File

@ -313,7 +313,7 @@ lxcDomainDefNamespaceFormatXML(virBufferPtr buf,
static const char *
lxcDomainDefNamespaceHref(void)
{
return "xmlns:lxc='" LXC_NAMESPACE_HREF "'";
return LXC_NAMESPACE_HREF;
}

2
src/qemu/qemu_domain.c
View File

@ -3724,7 +3724,7 @@ qemuDomainDefNamespaceFormatXML(virBufferPtr buf,
static const char *
qemuDomainDefNamespaceHref(void)
{
return "xmlns:qemu='" QEMU_NAMESPACE_HREF "'";
return QEMU_NAMESPACE_HREF;
}

7
src/test/test_driver.c
View File

@ -181,6 +181,12 @@ struct _testDomainNamespaceDef {
xmlNodePtr *snap_nodes;
};
static const char*
testDomainDefNamespaceHref(void)
{
return TEST_NAMESPACE_HREF;
}
static void
testDomainDefNamespaceFree(void *data)
{
@ -430,6 +436,7 @@ testDriverNew(void)
.parse = testDomainDefNamespaceParse,
.free = testDomainDefNamespaceFree,
.prefix = "test",
.href = testDomainDefNamespaceHref,
};
virDomainDefParserConfig config = {
.features = VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG |

2
src/vmx/vmx.c
View File

@ -600,7 +600,7 @@ virVMXDomainDefNamespaceFormatXML(virBufferPtr buf, void *nsdata)
static const char *
virVMXDomainDefNamespaceHref(void)
{
return "xmlns:vmware='http://libvirt.org/schemas/domain/vmware/1.0'";
return "http://libvirt.org/schemas/domain/vmware/1.0";
}
static virXMLNamespace virVMXDomainXMLNamespace = {