mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-13 00:01:55 +00:00
Rename virStorageBackendCreateQemuImgCmd
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:
parent
c59304e7e8
commit
a832735df9
@ -858,14 +858,17 @@ 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,
|
||||||
unsigned int flags,
|
unsigned int flags,
|
||||||
const char *create_tool,
|
const char *create_tool,
|
||||||
int imgformat)
|
int imgformat)
|
||||||
{
|
{
|
||||||
virCommandPtr cmd = NULL;
|
virCommandPtr cmd = NULL;
|
||||||
bool do_encryption = (vol->target.encryption != NULL);
|
bool do_encryption = (vol->target.encryption != NULL);
|
||||||
@ -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;
|
||||||
|
|
||||||
|
@ -192,13 +192,13 @@ 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,
|
||||||
unsigned int flags,
|
unsigned int flags,
|
||||||
const char *create_tool,
|
const char *create_tool,
|
||||||
int imgformat);
|
int imgformat);
|
||||||
|
|
||||||
/* ------- virStorageFile backends ------------ */
|
/* ------- virStorageFile backends ------------ */
|
||||||
typedef struct _virStorageFileBackend virStorageFileBackend;
|
typedef struct _virStorageFileBackend virStorageFileBackend;
|
||||||
|
@ -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();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user