External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-02 04:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Report error when taking a snapshot with empty --memspec argument

Browse Source 
When the value of memspec was empty taking of a snapshot failed without
reporting an error.
This commit is contained in:
Peter Krempa 2012-11-22 11:00:14 +01:00
parent 37db3f5dfe
commit fe910efd8a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/virsh-snapshot.c
View File

@ -358,18 +358,19 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd)
if (desc)
virBufferEscapeString(&buf, " <description>%s</description>\n", desc);
if (vshCommandOptString(cmd, "memspec", &memspec) < 0 ||
vshParseSnapshotMemspec(ctl, &buf, memspec) < 0) {
virBufferFreeAndReset(&buf);
if (vshCommandOptString(cmd, "memspec", &memspec) < 0) {
vshError(ctl, _("memspec argument must not be empty"));
goto cleanup;
}
if (memspec && vshParseSnapshotMemspec(ctl, &buf, memspec) < 0)
goto cleanup;
if (vshCommandOptBool(cmd, "diskspec")) {
virBufferAddLit(&buf, " <disks>\n");
while ((opt = vshCommandOptArgv(cmd, opt))) {
if (vshParseSnapshotDiskspec(ctl, &buf, opt->data) < 0) {
virBufferFreeAndReset(&buf);
if (vshParseSnapshotDiskspec(ctl, &buf, opt->data) < 0)
goto cleanup;
}
}
virBufferAddLit(&buf, " </disks>\n");
}
@ -390,6 +391,7 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd)
ret = vshSnapshotCreate(ctl, dom, buffer, flags, NULL);
cleanup:
virBufferFreeAndReset(&buf);
VIR_FREE(buffer);
if (dom)
virDomainFree(dom);