External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 20:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Use virXMLFormatElement to format disk source network

Browse Source 
Commit id 'e02ff020cac' neglected to use the attrBuf and childBuf
in the virDomainDiskSourceFormatNetwork call.

So make the necessary alterations to allow usage.
This commit is contained in:
John Ferlan 2017-09-13 16:45:51 -04:00
parent fae7a7354c
commit 304e0f6d16
1 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/conf/domain_conf.c
View File

@ -21671,13 +21671,14 @@ virDomainSourceDefFormatSeclabel(virBufferPtr buf,
static int
virDomainDiskSourceFormatNetwork(virBufferPtr buf,
virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf,
virBufferPtr childBuf,
virStorageSourcePtr src)
{
size_t n;
char *path = NULL;
virBufferAsprintf(buf, "<source protocol='%s'",
virBufferAsprintf(attrBuf, " protocol='%s'",
virStorageNetProtocolTypeToString(src->protocol));
if (src->volume) {
@ -21685,38 +21686,28 @@ virDomainDiskSourceFormatNetwork(virBufferPtr buf,
return -1;
}
virBufferEscapeString(buf, " name='%s'", path ? path : src->path);
virBufferEscapeString(attrBuf, " name='%s'", path ? path : src->path);
VIR_FREE(path);
if (src->nhosts == 0 && !src->snapshot && !src->configFile) {
virBufferAddLit(buf, "/>\n");
} else {
virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2);
for (n = 0; n < src->nhosts; n++) {
virBufferAddLit(childBuf, "<host");
virBufferEscapeString(childBuf, " name='%s'", src->hosts[n].name);
for (n = 0; n < src->nhosts; n++) {
virBufferAddLit(buf, "<host");
virBufferEscapeString(buf, " name='%s'", src->hosts[n].name);
if (src->hosts[n].port)
virBufferAsprintf(childBuf, " port='%u'", src->hosts[n].port);
if (src->hosts[n].port)
virBufferAsprintf(buf, " port='%u'", src->hosts[n].port);
if (src->hosts[n].transport)
virBufferAsprintf(childBuf, " transport='%s'",
virStorageNetHostTransportTypeToString(src->hosts[n].transport));
if (src->hosts[n].transport)
virBufferAsprintf(buf, " transport='%s'",
virStorageNetHostTransportTypeToString(src->hosts[n].transport));
virBufferEscapeString(buf, " socket='%s'", src->hosts[n].socket);
virBufferAddLit(buf, "/>\n");
}
virBufferEscapeString(buf, "<snapshot name='%s'/>\n", src->snapshot);
virBufferEscapeString(buf, "<config file='%s'/>\n", src->configFile);
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</source>\n");
virBufferEscapeString(childBuf, " socket='%s'", src->hosts[n].socket);
virBufferAddLit(childBuf, "/>\n");
}
virBufferEscapeString(childBuf, "<snapshot name='%s'/>\n", src->snapshot);
virBufferEscapeString(childBuf, "<config file='%s'/>\n", src->configFile);
return 0;
}
@ -21763,7 +21754,7 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf,
break;
case VIR_STORAGE_TYPE_NETWORK:
if (virDomainDiskSourceFormatNetwork(buf, src) < 0)
if (virDomainDiskSourceFormatNetwork(&attrBuf, &childBuf, src) < 0)
goto error;
break;