shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 09:17:52 +03:00
Code Releases Activity

storage_util: Move @type into _virStorageBackendQemuImgInfo

Browse Source 
We're about to split up the code a bit more, so we'll need this
to be in the local struct.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2018-05-07 15:22:35 -04:00
parent b5c8c547b7
commit 4b9055c930
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/storage/storage_util.c
View File

@ -794,6 +794,7 @@ storagePloopResize(virStorageVolDefPtr vol,
*/ */
struct _virStorageBackendQemuImgInfo { struct _virStorageBackendQemuImgInfo {
int format; int format;
const char *type;
const char *path; const char *path;
unsigned long long size_arg; unsigned long long size_arg;
unsigned long long allocation; unsigned long long allocation;
@ -1125,9 +1126,9 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool,
const char *secretPath) const char *secretPath)
{ {
virCommandPtr cmd = NULL; virCommandPtr cmd = NULL;
const char *type;
struct _virStorageBackendQemuImgInfo info = { struct _virStorageBackendQemuImgInfo info = {
.format = vol->target.format, .format = vol->target.format,
.type = NULL,
.path = vol->target.path, .path = vol->target.path,
.allocation = vol->target.allocation, .allocation = vol->target.allocation,
.encryption = !!vol->target.encryption, .encryption = !!vol->target.encryption,
@ -1149,7 +1150,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool,
if (info.format == VIR_STORAGE_FILE_ISO) if (info.format == VIR_STORAGE_FILE_ISO)
info.format = VIR_STORAGE_FILE_RAW; info.format = VIR_STORAGE_FILE_RAW;
if (!(type = virStorageFileFormatTypeToString(info.format))) { if (!(info.type = virStorageFileFormatTypeToString(info.format))) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unknown storage vol type %d"), _("unknown storage vol type %d"),
info.format); info.format);
@ -1178,7 +1179,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool,
return NULL; return NULL;
} }
if (vol->target.encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS) { if (vol->target.encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS) {
type = "luks"; info.type = "luks";
} else { } else {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Only luks encryption is supported for raw files")); _("Only luks encryption is supported for raw files"));
@ -1195,7 +1196,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool,
return NULL; return NULL;
if (info.encryption && if (info.encryption &&
storageBackendCreateQemuImgCheckEncryption(info.format, type, vol) < 0) storageBackendCreateQemuImgCheckEncryption(info.format, info.type, vol) < 0)
return NULL; return NULL;
/* Size in KB */ /* Size in KB */
@ -1209,9 +1210,9 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool,
if (info.inputPath) if (info.inputPath)
virCommandAddArgList(cmd, "convert", "-f", info.inputFormatStr, virCommandAddArgList(cmd, "convert", "-f", info.inputFormatStr,
"-O", type, NULL); "-O", info.type, NULL);
else else
virCommandAddArgList(cmd, "create", "-f", type, NULL); virCommandAddArgList(cmd, "create", "-f", info.type, NULL);
if (info.backingPath) if (info.backingPath)
virCommandAddArgList(cmd, "-b", info.backingPath, NULL); virCommandAddArgList(cmd, "-b", info.backingPath, NULL);