External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-06 00:43:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh-volume: Update volume commands to use vshCommandOptStringReq

Browse Source
This commit is contained in:
Peter Krempa 2013-01-18 16:40:08 +01:00
parent 98007c8138
commit 1daa4ba33a
1 changed files with 28 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
tools/virsh-volume.c
View File

@ -52,13 +52,12 @@ vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd,
const char *n = NULL, *p = NULL; const char *n = NULL, *p = NULL;
virCheckFlags(VSH_BYUUID | VSH_BYNAME, NULL); virCheckFlags(VSH_BYUUID | VSH_BYNAME, NULL);
if (vshCommandOptString(cmd, optname, &n) <= 0) if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0)
return NULL; return NULL;
if (pooloptname != NULL && vshCommandOptString(cmd, pooloptname, &p) < 0) { if (pooloptname != NULL &&
vshError(ctl, "%s", _("missing option")); vshCommandOptStringReq(ctl, cmd, pooloptname, &p) < 0)
return NULL; return NULL;
}
if (p) if (p)
pool = vshCommandOptPoolBy(ctl, cmd, pooloptname, name, flags); pool = vshCommandOptPoolBy(ctl, cmd, pooloptname, name, flags);
@ -182,10 +181,10 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd)
VSH_BYNAME))) VSH_BYNAME)))
return false; return false;
if (vshCommandOptString(cmd, "name", &name) <= 0) if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0)
goto cleanup; goto cleanup;
if (vshCommandOptString(cmd, "capacity", &capacityStr) <= 0) if (vshCommandOptStringReq(ctl, cmd, "capacity", &capacityStr) < 0)
goto cleanup; goto cleanup;
if (vshVolSize(capacityStr, &capacity) < 0) { if (vshVolSize(capacityStr, &capacity) < 0) {
@ -199,14 +198,11 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd)
goto cleanup; goto cleanup;
} }
if (vshCommandOptString(cmd, "format", &format) < 0 || if (vshCommandOptStringReq(ctl, cmd, "format", &format) < 0 ||
vshCommandOptString(cmd, "backing-vol", &snapshotStrVol) < 0 || vshCommandOptStringReq(ctl, cmd, "backing-vol", &snapshotStrVol) < 0 ||
vshCommandOptString(cmd, "backing-vol-format", vshCommandOptStringReq(ctl, cmd, "backing-vol-format",
&snapshotStrFormat) < 0) { &snapshotStrFormat) < 0)
vshError(ctl, "%s", _("missing argument"));
goto cleanup; goto cleanup;
}
virBufferAddLit(&buf, "<volume>\n"); virBufferAddLit(&buf, "<volume>\n");
virBufferAsprintf(&buf, " <name>%s</name>\n", name); virBufferAsprintf(&buf, " <name>%s</name>\n", name);
@ -340,9 +336,9 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd)
virStoragePoolPtr pool; virStoragePoolPtr pool;
virStorageVolPtr vol; virStorageVolPtr vol;
const char *from = NULL; const char *from = NULL;
bool ret = true; bool ret = false;
unsigned int flags = 0; unsigned int flags = 0;
char *buffer; char *buffer = NULL;
if (vshCommandOptBool(cmd, "prealloc-metadata")) if (vshCommandOptBool(cmd, "prealloc-metadata"))
flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA;
@ -350,29 +346,26 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd)
VSH_BYNAME))) VSH_BYNAME)))
return false; return false;
if (vshCommandOptString(cmd, "file", &from) <= 0) { if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0)
virStoragePoolFree(pool); goto cleanup;
return false;
}
if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) { if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) {
vshReportError(ctl); vshSaveLibvirtError();
virStoragePoolFree(pool); goto cleanup;
return false;
} }
vol = virStorageVolCreateXML(pool, buffer, flags); if ((vol = virStorageVolCreateXML(pool, buffer, flags))) {
VIR_FREE(buffer);
virStoragePoolFree(pool);
if (vol != NULL) {
vshPrint(ctl, _("Vol %s created from %s\n"), vshPrint(ctl, _("Vol %s created from %s\n"),
virStorageVolGetName(vol), from); virStorageVolGetName(vol), from);
virStorageVolFree(vol); virStorageVolFree(vol);
ret = true;
} else { } else {
vshError(ctl, _("Failed to create vol from %s"), from); vshError(ctl, _("Failed to create vol from %s"), from);
ret = false;
} }
cleanup:
VIR_FREE(buffer);
virStoragePoolFree(pool);
return ret; return ret;
} }
@ -429,9 +422,9 @@ cmdVolCreateFrom(vshControl *ctl, const vshCmd *cmd)
if (vshCommandOptBool(cmd, "prealloc-metadata")) if (vshCommandOptBool(cmd, "prealloc-metadata"))
flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA;
if (vshCommandOptString(cmd, "file", &from) <= 0) {
if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0)
goto cleanup; goto cleanup;
}
if (!(inputvol = vshCommandOptVol(ctl, cmd, "vol", "inputpool", NULL))) if (!(inputvol = vshCommandOptVol(ctl, cmd, "vol", "inputpool", NULL)))
goto cleanup; goto cleanup;
@ -548,7 +541,7 @@ cmdVolClone(vshControl *ctl, const vshCmd *cmd)
goto cleanup; goto cleanup;
} }
if (vshCommandOptString(cmd, "newname", &name) <= 0) if (vshCommandOptStringReq(ctl, cmd, "newname", &name) < 0)
goto cleanup; goto cleanup;
origxml = virStorageVolGetXMLDesc(origvol, 0); origxml = virStorageVolGetXMLDesc(origvol, 0);
@ -658,10 +651,8 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd)
return false; return false;
} }
if (vshCommandOptString(cmd, "file", &file) < 0) { if (vshCommandOptStringReq(ctl, cmd, "file", &file) < 0)
vshError(ctl, _("file must not be empty"));
goto cleanup; goto cleanup;
}
if ((fd = open(file, O_RDONLY)) < 0) { if ((fd = open(file, O_RDONLY)) < 0) {
vshError(ctl, _("cannot read %s"), file); vshError(ctl, _("cannot read %s"), file);
@ -764,10 +755,8 @@ cmdVolDownload(vshControl *ctl, const vshCmd *cmd)
if (!(vol = vshCommandOptVol(ctl, cmd, "vol", "pool", &name))) if (!(vol = vshCommandOptVol(ctl, cmd, "vol", "pool", &name)))
return false; return false;
if (vshCommandOptString(cmd, "file", &file) < 0) { if (vshCommandOptStringReq(ctl, cmd, "file", &file) < 0)
vshError(ctl, _("file must not be empty"));
goto cleanup; goto cleanup;
}
if ((fd = open(file, O_WRONLY|O_CREAT|O_EXCL, 0666)) < 0) { if ((fd = open(file, O_WRONLY|O_CREAT|O_EXCL, 0666)) < 0) {
if (errno != EEXIST || if (errno != EEXIST ||
@ -906,10 +895,8 @@ cmdVolWipe(vshControl *ctl, const vshCmd *cmd)
return false; return false;
} }
if (vshCommandOptString(cmd, "algorithm", &algorithm_str) < 0) { if (vshCommandOptStringReq(ctl, cmd, "algorithm", &algorithm_str) < 0)
vshError(ctl, "%s", _("missing argument"));
goto out; goto out;
}
if (algorithm_str && if (algorithm_str &&
(algorithm = virStorageVolWipeAlgorithmTypeFromString(algorithm_str)) < 0) { (algorithm = virStorageVolWipeAlgorithmTypeFromString(algorithm_str)) < 0) {
@ -1072,7 +1059,7 @@ cmdVolResize(vshControl *ctl, const vshCmd *cmd)
if (!(vol = vshCommandOptVol(ctl, cmd, "vol", "pool", NULL))) if (!(vol = vshCommandOptVol(ctl, cmd, "vol", "pool", NULL)))
return false; return false;
if (vshCommandOptString(cmd, "capacity", &capacityStr) <= 0) if (vshCommandOptStringReq(ctl, cmd, "capacity", &capacityStr) <= 0)
goto cleanup; goto cleanup;
virSkipSpaces(&capacityStr); virSkipSpaces(&capacityStr);
if (*capacityStr == '-') { if (*capacityStr == '-') {