NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

storage: Alter args to storageBackendResizeQemuImg

Browse Source 
Rather than passing just the path, pass the virStorageVolDefPtr as we're
going to need it shortly.

Also fix the order of code and stack variables in the calling function
virStorageBackendVolResizeLocal.
This commit is contained in:
John Ferlan 2017-10-06 10:08:36 -04:00
parent 0167e9c535
commit ae94084b76
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/storage/storage_util.c
View File

@ -2287,7 +2287,7 @@ virStorageBackendVolRefreshLocal(virConnectPtr conn,
static int static int
storageBackendResizeQemuImg(const char *path, storageBackendResizeQemuImg(virStorageVolDefPtr vol,
unsigned long long capacity) unsigned long long capacity)
{ {
int ret = -1; int ret = -1;
@ -2306,7 +2306,7 @@ storageBackendResizeQemuImg(const char *path,
capacity = VIR_ROUND_UP(capacity, 512); capacity = VIR_ROUND_UP(capacity, 512);
cmd = virCommandNew(img_tool); cmd = virCommandNew(img_tool);
virCommandAddArgList(cmd, "resize", path, NULL); virCommandAddArgList(cmd, "resize", vol->target.path, NULL);
virCommandAddArgFormat(cmd, "%llu", capacity); virCommandAddArgFormat(cmd, "%llu", capacity);
ret = virCommandRun(cmd, NULL); ret = virCommandRun(cmd, NULL);
@ -2328,11 +2328,11 @@ virStorageBackendVolResizeLocal(virConnectPtr conn ATTRIBUTE_UNUSED,
unsigned long long capacity, unsigned long long capacity,
unsigned int flags) unsigned int flags)
{ {
bool pre_allocate = flags & VIR_STORAGE_VOL_RESIZE_ALLOCATE;
virCheckFlags(VIR_STORAGE_VOL_RESIZE_ALLOCATE | virCheckFlags(VIR_STORAGE_VOL_RESIZE_ALLOCATE |
VIR_STORAGE_VOL_RESIZE_SHRINK, -1); VIR_STORAGE_VOL_RESIZE_SHRINK, -1);
bool pre_allocate = flags & VIR_STORAGE_VOL_RESIZE_ALLOCATE;
if (vol->target.format == VIR_STORAGE_FILE_RAW) { if (vol->target.format == VIR_STORAGE_FILE_RAW) {
return virStorageFileResize(vol->target.path, capacity, pre_allocate); return virStorageFileResize(vol->target.path, capacity, pre_allocate);
} else if (vol->target.format == VIR_STORAGE_FILE_PLOOP) { } else if (vol->target.format == VIR_STORAGE_FILE_PLOOP) {
@ -2345,7 +2345,7 @@ virStorageBackendVolResizeLocal(virConnectPtr conn ATTRIBUTE_UNUSED,
return -1; return -1;
} }
return storageBackendResizeQemuImg(vol->target.path, capacity); return storageBackendResizeQemuImg(vol, capacity);
} }
} }