On Wed, Aug 21, 2019 at 01:15:39 +0200, Ján Tomko wrote:
Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/bhyve/bhyve_domain.c | 2 +- src/conf/domain_conf.c | 2 +- src/lxc/lxc_domain.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/vmx/vmx.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 9a21cde452..631fb50db9 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -270,7 +270,7 @@ bhyveDomainDefNamespaceFormatXML(virBufferPtr buf, static const char * bhyveDomainDefNamespaceHref(void) { - return "xmlns:bhyve='" BHYVE_NAMESPACE_HREF "'"; + return BHYVE_NAMESPACE_HREF; }
virXMLNamespace virBhyveDriverDomainXMLNamespace = { diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3a1f7c9709..a39f5f845d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28314,7 +28314,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (!(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE)) virBufferAsprintf(buf, " id='%d'", def->id); if (def->namespaceData && def->ns.format) - virBufferAsprintf(buf, " %s", (def->ns.href)()); + virXMLNamespaceFormatNS(buf, &def->ns); virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2);
I see the reason for the change in 3/21 now. But I think the change should be squashed in this patch as it doesn't make a lot of sense when isolated. Unless you explain that def->ns.href is never NULL there... Reviewed-by: Jiri Denemark <jdenemar@redhat.com>