External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename virStorageBackendCreateQemuImgCmd

Browse Source 
Add FromVol at the end. This function will create the qemu-img
command line from volume definitions and check them.
This commit is contained in:
Ján Tomko 2014-07-31 18:08:33 +02:00
parent c59304e7e8
commit a832735df9
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/storage/storage_backend.c
View File

@ -858,8 +858,11 @@ virStorageBackendCreateQemuImgOpts(char **opts,
return -1; return -1;
} }
/* Create a qemu-img virCommand from the supplied binary path,
* volume definitions and imgformat
*/
virCommandPtr virCommandPtr
virStorageBackendCreateQemuImgCmd(virConnectPtr conn, virStorageBackendCreateQemuImgCmdFromVol(virConnectPtr conn,
virStoragePoolObjPtr pool, virStoragePoolObjPtr pool,
virStorageVolDefPtr vol, virStorageVolDefPtr vol,
virStorageVolDefPtr inputvol, virStorageVolDefPtr inputvol,
@ -1094,8 +1097,8 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
if (imgformat < 0) if (imgformat < 0)
goto cleanup; goto cleanup;
cmd = virStorageBackendCreateQemuImgCmd(conn, pool, vol, inputvol, flags, cmd = virStorageBackendCreateQemuImgCmdFromVol(conn, pool, vol, inputvol,
create_tool, imgformat); flags, create_tool, imgformat);
if (!cmd) if (!cmd)
goto cleanup; goto cleanup;

2
src/storage/storage_backend.h
View File

@ -192,7 +192,7 @@ char *virStorageBackendStablePath(virStoragePoolObjPtr pool,
bool loop); bool loop);
virCommandPtr virCommandPtr
virStorageBackendCreateQemuImgCmd(virConnectPtr conn, virStorageBackendCreateQemuImgCmdFromVol(virConnectPtr conn,
virStoragePoolObjPtr pool, virStoragePoolObjPtr pool,
virStorageVolDefPtr vol, virStorageVolDefPtr vol,
virStorageVolDefPtr inputvol, virStorageVolDefPtr inputvol,

5
tests/storagevolxml2argvtest.c
View File

@ -98,8 +98,9 @@ testCompareXMLToArgvFiles(bool shouldFail,
testSetVolumeType(vol, pool); testSetVolumeType(vol, pool);
testSetVolumeType(inputvol, inputpool); testSetVolumeType(inputvol, inputpool);
cmd = virStorageBackendCreateQemuImgCmd(conn, &poolobj, vol, inputvol, cmd = virStorageBackendCreateQemuImgCmdFromVol(conn, &poolobj, vol,
flags, create_tool, imgformat); inputvol, flags,
create_tool, imgformat);
if (!cmd) { if (!cmd) {
if (shouldFail) { if (shouldFail) {
virResetLastError(); virResetLastError();