External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-04 07:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Use virBuffer for generating XML

Browse Source 
cmdAttachInterface and cmdAttachDisk still used vshRealloc and sprintf
for generating XML, which is hardly maintainable. Let's get rid of this
old code.
This commit is contained in:
Jiri Denemark 2010-09-10 13:38:40 +02:00
parent 249a5b35f2
commit fc3247f211
1 changed files with 57 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
tools/virsh.c
View File

@ -7874,8 +7874,9 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd)
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
char *mac, *target, *script, *type, *source; char *mac, *target, *script, *type, *source;
int typ, ret = FALSE; int typ, ret = FALSE;
char *buf = NULL, *tmp = NULL;
unsigned int flags; unsigned int flags;
virBuffer buf = VIR_BUFFER_INITIALIZER;
char *xml;
if (!vshConnectionUsability(ctl, ctl->conn)) if (!vshConnectionUsability(ctl, ctl->conn))
goto cleanup; goto cleanup;
@ -7903,52 +7904,40 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd)
} }
/* Make XML of interface */ /* Make XML of interface */
tmp = vshMalloc(ctl, 1); virBufferVSprintf(&buf, "<interface type='%s'>\n", type);
buf = vshMalloc(ctl, strlen(type) + 25);
sprintf(buf, " <interface type='%s'>\n" , type);
tmp = vshRealloc(ctl, tmp, strlen(source) + 28); if (typ == 1)
if (typ == 1) { virBufferVSprintf(&buf, " <source network='%s'/>\n", source);
sprintf(tmp, " <source network='%s'/>\n", source); else if (typ == 2)
} else if (typ == 2) { virBufferVSprintf(&buf, " <source bridge='%s'/>\n", source);
sprintf(tmp, " <source bridge='%s'/>\n", source);
}
buf = vshRealloc(ctl, buf, strlen(buf) + strlen(tmp) + 1);
strcat(buf, tmp);
if (target != NULL) { if (target != NULL)
tmp = vshRealloc(ctl, tmp, strlen(target) + 24); virBufferVSprintf(&buf, " <target dev='%s'/>\n", target);
sprintf(tmp, " <target dev='%s'/>\n", target); if (mac != NULL)
buf = vshRealloc(ctl, buf, strlen(buf) + strlen(tmp) + 1); virBufferVSprintf(&buf, " <mac address='%s'/>\n", mac);
strcat(buf, tmp); if (script != NULL)
virBufferVSprintf(&buf, " <script path='%s'/>\n", script);
virBufferAddLit(&buf, "</interface>\n");
if (virBufferError(&buf)) {
vshPrint(ctl, "%s", _("Failed to allocate XML buffer"));
return FALSE;
} }
if (mac != NULL) { xml = virBufferContentAndReset(&buf);
tmp = vshRealloc(ctl, tmp, strlen(mac) + 25);
sprintf(tmp, " <mac address='%s'/>\n", mac);
buf = vshRealloc(ctl, buf, strlen(buf) + strlen(tmp) + 1);
strcat(buf, tmp);
}
if (script != NULL) {
tmp = vshRealloc(ctl, tmp, strlen(script) + 25);
sprintf(tmp, " <script path='%s'/>\n", script);
buf = vshRealloc(ctl, buf, strlen(buf) + strlen(tmp) + 1);
strcat(buf, tmp);
}
buf = vshRealloc(ctl, buf, strlen(buf) + 19);
strcat(buf, " </interface>\n");
if (vshCommandOptBool(cmd, "persistent")) { if (vshCommandOptBool(cmd, "persistent")) {
flags = VIR_DOMAIN_DEVICE_MODIFY_CONFIG; flags = VIR_DOMAIN_DEVICE_MODIFY_CONFIG;
if (virDomainIsActive(dom) == 1) if (virDomainIsActive(dom) == 1)
flags |= VIR_DOMAIN_DEVICE_MODIFY_LIVE; flags |= VIR_DOMAIN_DEVICE_MODIFY_LIVE;
ret = virDomainAttachDeviceFlags(dom, buf, flags); ret = virDomainAttachDeviceFlags(dom, xml, flags);
} else { } else {
ret = virDomainAttachDevice(dom, buf); ret = virDomainAttachDevice(dom, xml);
} }
VIR_FREE(xml);
if (ret != 0) { if (ret != 0) {
vshError(ctl, "%s", _("Failed to attach interface")); vshError(ctl, "%s", _("Failed to attach interface"));
ret = FALSE; ret = FALSE;
@ -7960,8 +7949,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd)
cleanup: cleanup:
if (dom) if (dom)
virDomainFree(dom); virDomainFree(dom);
VIR_FREE(buf); virBufferFreeAndReset(&buf);
VIR_FREE(tmp);
return ret; return ret;
} }
@ -8126,9 +8114,10 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd)
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
char *source, *target, *driver, *subdriver, *type, *mode; char *source, *target, *driver, *subdriver, *type, *mode;
int isFile = 0, ret = FALSE; int isFile = 0, ret = FALSE;
char *buf = NULL, *tmp = NULL;
unsigned int flags; unsigned int flags;
char *stype; char *stype;
virBuffer buf = VIR_BUFFER_INITIALIZER;
char *xml;
if (!vshConnectionUsability(ctl, ctl->conn)) if (!vshConnectionUsability(ctl, ctl->conn))
goto cleanup; goto cleanup;
@ -8167,77 +8156,45 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd)
} }
/* Make XML of disk */ /* Make XML of disk */
tmp = vshMalloc(ctl, 1); virBufferVSprintf(&buf, "<disk type='%s'",
buf = vshMalloc(ctl, 23); (isFile) ? "file" : "block");
if (isFile) { if (type)
sprintf(buf, " <disk type='file'"); virBufferVSprintf(&buf, " device='%s'", type);
} else { virBufferAddLit(&buf, ">\n");
sprintf(buf, " <disk type='block'");
virBufferVSprintf(&buf, " <driver name='%s'",
(driver) ? driver : "phy");
if (subdriver)
virBufferVSprintf(&buf, " type='%s'", subdriver);
virBufferAddLit(&buf, "/>\n");
virBufferVSprintf(&buf, " <source %s='%s'/>\n",
(isFile) ? "file" : "dev",
source);
virBufferVSprintf(&buf, " <target dev='%s'/>\n", target);
if (mode)
virBufferVSprintf(&buf, " <%s/>\n", mode);
virBufferAddLit(&buf, "</disk>\n");
if (virBufferError(&buf)) {
vshPrint(ctl, "%s", _("Failed to allocate XML buffer"));
return FALSE;
} }
if (type) { xml = virBufferContentAndReset(&buf);
tmp = vshRealloc(ctl, tmp, strlen(type) + 13);
sprintf(tmp, " device='%s'>\n", type);
} else {
tmp = vshRealloc(ctl, tmp, 3);
sprintf(tmp, ">\n");
}
buf = vshRealloc(ctl, buf, strlen(buf) + strlen(tmp) + 1);
strcat(buf, tmp);
if (driver) {
tmp = vshRealloc(ctl, tmp, strlen(driver) + 22);
sprintf(tmp, " <driver name='%s'", driver);
} else {
tmp = vshRealloc(ctl, tmp, 25);
sprintf(tmp, " <driver name='phy'");
}
buf = vshRealloc(ctl, buf, strlen(buf) + strlen(tmp) + 1);
strcat(buf, tmp);
if (subdriver) {
tmp = vshRealloc(ctl, tmp, strlen(subdriver) + 12);
sprintf(tmp, " type='%s'/>\n", subdriver);
} else {
tmp = vshRealloc(ctl, tmp, 4);
sprintf(tmp, "/>\n");
}
buf = vshRealloc(ctl, buf, strlen(buf) + strlen(tmp) + 1);
strcat(buf, tmp);
tmp = vshRealloc(ctl, tmp, strlen(source) + 25);
if (isFile) {
sprintf(tmp, " <source file='%s'/>\n", source);
} else {
sprintf(tmp, " <source dev='%s'/>\n", source);
}
buf = vshRealloc(ctl, buf, strlen(buf) + strlen(tmp) + 1);
strcat(buf, tmp);
tmp = vshRealloc(ctl, tmp, strlen(target) + 24);
sprintf(tmp, " <target dev='%s'/>\n", target);
buf = vshRealloc(ctl, buf, strlen(buf) + strlen(tmp) + 1);
strcat(buf, tmp);
if (mode != NULL) {
tmp = vshRealloc(ctl, tmp, strlen(mode) + 11);
sprintf(tmp, " <%s/>\n", mode);
buf = vshRealloc(ctl, buf, strlen(buf) + strlen(tmp) + 1);
strcat(buf, tmp);
}
buf = vshRealloc(ctl, buf, strlen(buf) + 13);
strcat(buf, " </disk>\n");
if (vshCommandOptBool(cmd, "persistent")) { if (vshCommandOptBool(cmd, "persistent")) {
flags = VIR_DOMAIN_DEVICE_MODIFY_CONFIG; flags = VIR_DOMAIN_DEVICE_MODIFY_CONFIG;
if (virDomainIsActive(dom) == 1) if (virDomainIsActive(dom) == 1)
flags |= VIR_DOMAIN_DEVICE_MODIFY_LIVE; flags |= VIR_DOMAIN_DEVICE_MODIFY_LIVE;
ret = virDomainAttachDeviceFlags(dom, buf, flags); ret = virDomainAttachDeviceFlags(dom, xml, flags);
} else { } else {
ret = virDomainAttachDevice(dom, buf); ret = virDomainAttachDevice(dom, xml);
} }
VIR_FREE(xml);
if (ret != 0) { if (ret != 0) {
vshError(ctl, "%s", _("Failed to attach disk")); vshError(ctl, "%s", _("Failed to attach disk"));
ret = FALSE; ret = FALSE;
@ -8249,8 +8206,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd)
cleanup: cleanup:
if (dom) if (dom)
virDomainFree(dom); virDomainFree(dom);
VIR_FREE(buf); virBufferFreeAndReset(&buf);
VIR_FREE(tmp);
return ret; return ret;
} }