External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 23:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fill in secret UUID for qcow encryption

Browse Source 
* src/storage_backend_fs.c: Lookup & fill in secret passphrase UUID
  for storage volumes using encryption
This commit is contained in:
Daniel P. Berrange 2009-09-11 14:13:45 +01:00
parent a2a30038cf
commit 756be09d23
1 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/storage_backend_fs.c
View File

@ -430,6 +430,11 @@ static int virStorageBackendProbeTarget(virConnectPtr conn,
} }
enc->format = VIR_STORAGE_ENCRYPTION_FORMAT_QCOW; enc->format = VIR_STORAGE_ENCRYPTION_FORMAT_QCOW;
*encryption = enc; *encryption = enc;
/* XXX ideally we'd fill in secret UUID here
* but we cannot guarentee 'conn' is non-NULL
* at this point in time :-( So we only fill
* in secrets when someone first queries a vol
*/
} }
return 0; return 0;
} }
@ -1230,8 +1235,42 @@ virStorageBackendFileSystemVolRefresh(virConnectPtr conn,
virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool ATTRIBUTE_UNUSED,
virStorageVolDefPtr vol) virStorageVolDefPtr vol)
{ {
int ret;
/* Refresh allocation / permissions info in case its changed */ /* Refresh allocation / permissions info in case its changed */
return virStorageBackendUpdateVolInfo(conn, vol, 0); ret = virStorageBackendUpdateVolInfo(conn, vol, 0);
if (ret < 0)
return ret;
/* Load any secrets if posible */
if (vol->target.encryption &&
vol->target.encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_QCOW &&
vol->target.encryption->nsecrets == 0) {
virSecretPtr sec;
virStorageEncryptionSecretPtr encsec = NULL;
sec = virSecretLookupByUsage(conn,
VIR_SECRET_USAGE_TYPE_VOLUME,
vol->target.path);
if (sec) {
if (VIR_ALLOC_N(vol->target.encryption->secrets, 1) < 0 ||
VIR_ALLOC(encsec) < 0) {
VIR_FREE(vol->target.encryption->secrets);
virReportOOMError(conn);
virSecretFree(sec);
return -1;
}
vol->target.encryption->nsecrets = 1;
vol->target.encryption->secrets[0] = encsec;
encsec->type = VIR_STORAGE_ENCRYPTION_SECRET_TYPE_PASSPHRASE;
virSecretGetUUID(sec, encsec->uuid);
virSecretFree(sec);
}
}
return 0;
} }
virStorageBackend virStorageBackendDirectory = { virStorageBackend virStorageBackendDirectory = {