External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 14:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introduce virStorageFileMetadata structure

Browse Source 
Introduce a metadata structure and make virStorageGetMetadataFromFD()
fill it in.

* src/util/storage_file.h: add virStorageFileMetadata

* src/backend/storage_backend_fs.c: virStorageGetMetadataFromFD() now
  fills in the virStorageFileMetadata structure
This commit is contained in:
Mark McLoughlin 2009-09-29 09:23:04 +01:00
parent f5fc670638
commit 5fede0a90b
2 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/storage/storage_backend_fs.c
View File

@ -287,24 +287,13 @@ static int
virStorageGetMetadataFromFD(virConnectPtr conn, virStorageGetMetadataFromFD(virConnectPtr conn,
const char *path, const char *path,
int fd, int fd,
int *format, virStorageFileMetadata *meta)
bool *encrypted,
char **backingStore,
unsigned long long *capacity)
{ {
unsigned char head[20*512]; /* vmdk4GetBackingStore needs this much. */ unsigned char head[20*512]; /* vmdk4GetBackingStore needs this much. */
int len, i; int len, i;
if (format) /* If all else fails, call it a raw file */ /* If all else fails, call it a raw file */
*format = VIR_STORAGE_FILE_RAW; meta->format = VIR_STORAGE_FILE_RAW;
if (encrypted)
*encrypted = false;
if (backingStore)
*backingStore = NULL;
/* Do not overwrite capacity
* if (capacity)
* *capacity = 0;
*/
if ((len = read(fd, head, sizeof(head))) < 0) { if ((len = read(fd, head, sizeof(head))) < 0) {
virReportSystemError(conn, errno, _("cannot read header '%s'"), path); virReportSystemError(conn, errno, _("cannot read header '%s'"), path);
@ -345,9 +334,9 @@ virStorageGetMetadataFromFD(virConnectPtr conn,
} }
/* Optionally extract capacity from file */ /* Optionally extract capacity from file */
if (fileTypeInfo[i].sizeOffset != -1 && capacity) { if (fileTypeInfo[i].sizeOffset != -1) {
if (fileTypeInfo[i].endian == LV_LITTLE_ENDIAN) { if (fileTypeInfo[i].endian == LV_LITTLE_ENDIAN) {
*capacity = meta->capacity =
((unsigned long long)head[fileTypeInfo[i].sizeOffset+7] << 56) | ((unsigned long long)head[fileTypeInfo[i].sizeOffset+7] << 56) |
((unsigned long long)head[fileTypeInfo[i].sizeOffset+6] << 48) | ((unsigned long long)head[fileTypeInfo[i].sizeOffset+6] << 48) |
((unsigned long long)head[fileTypeInfo[i].sizeOffset+5] << 40) | ((unsigned long long)head[fileTypeInfo[i].sizeOffset+5] << 40) |
@ -357,7 +346,7 @@ virStorageGetMetadataFromFD(virConnectPtr conn,
((unsigned long long)head[fileTypeInfo[i].sizeOffset+1] << 8) | ((unsigned long long)head[fileTypeInfo[i].sizeOffset+1] << 8) |
((unsigned long long)head[fileTypeInfo[i].sizeOffset]); ((unsigned long long)head[fileTypeInfo[i].sizeOffset]);
} else { } else {
*capacity = meta->capacity =
((unsigned long long)head[fileTypeInfo[i].sizeOffset] << 56) | ((unsigned long long)head[fileTypeInfo[i].sizeOffset] << 56) |
((unsigned long long)head[fileTypeInfo[i].sizeOffset+1] << 48) | ((unsigned long long)head[fileTypeInfo[i].sizeOffset+1] << 48) |
((unsigned long long)head[fileTypeInfo[i].sizeOffset+2] << 40) | ((unsigned long long)head[fileTypeInfo[i].sizeOffset+2] << 40) |
@ -368,25 +357,24 @@ virStorageGetMetadataFromFD(virConnectPtr conn,
((unsigned long long)head[fileTypeInfo[i].sizeOffset+7]); ((unsigned long long)head[fileTypeInfo[i].sizeOffset+7]);
} }
/* Avoid unlikely, but theoretically possible overflow */ /* Avoid unlikely, but theoretically possible overflow */
if (*capacity > (ULLONG_MAX / fileTypeInfo[i].sizeMultiplier)) if (meta->capacity > (ULLONG_MAX / fileTypeInfo[i].sizeMultiplier))
continue; continue;
*capacity *= fileTypeInfo[i].sizeMultiplier; meta->capacity *= fileTypeInfo[i].sizeMultiplier;
} }
if (fileTypeInfo[i].qcowCryptOffset != -1 && encrypted) { if (fileTypeInfo[i].qcowCryptOffset != -1) {
int crypt_format; int crypt_format;
crypt_format = (head[fileTypeInfo[i].qcowCryptOffset] << 24) | crypt_format = (head[fileTypeInfo[i].qcowCryptOffset] << 24) |
(head[fileTypeInfo[i].qcowCryptOffset+1] << 16) | (head[fileTypeInfo[i].qcowCryptOffset+1] << 16) |
(head[fileTypeInfo[i].qcowCryptOffset+2] << 8) | (head[fileTypeInfo[i].qcowCryptOffset+2] << 8) |
head[fileTypeInfo[i].qcowCryptOffset+3]; head[fileTypeInfo[i].qcowCryptOffset+3];
*encrypted = crypt_format != 0; meta->encrypted = crypt_format != 0;
} }
/* Validation passed, we know the file format now */ /* Validation passed, we know the file format now */
if (format) meta->format = fileTypeInfo[i].type;
*format = fileTypeInfo[i].type; if (fileTypeInfo[i].getBackingStore != NULL) {
if (fileTypeInfo[i].getBackingStore != NULL && backingStore) {
char *base; char *base;
switch (fileTypeInfo[i].getBackingStore(conn, &base, head, len)) { switch (fileTypeInfo[i].getBackingStore(conn, &base, head, len)) {
@ -400,9 +388,9 @@ virStorageGetMetadataFromFD(virConnectPtr conn,
return -1; return -1;
} }
if (base != NULL) { if (base != NULL) {
*backingStore = absolutePathFromBaseFile(path, base); meta->backingStore = absolutePathFromBaseFile(path, base);
VIR_FREE(base); VIR_FREE(base);
if (*backingStore == NULL) { if (meta->backingStore == NULL) {
virReportOOMError(conn); virReportOOMError(conn);
return -1; return -1;
} }
@ -419,8 +407,7 @@ virStorageGetMetadataFromFD(virConnectPtr conn,
if (!virFileHasSuffix(path, fileTypeInfo[i].extension)) if (!virFileHasSuffix(path, fileTypeInfo[i].extension))
continue; continue;
if (format) meta->format = fileTypeInfo[i].type;
*format = fileTypeInfo[i].type;
return 0; return 0;
} }
@ -436,7 +423,7 @@ virStorageBackendProbeTarget(virConnectPtr conn,
virStorageEncryptionPtr *encryption) virStorageEncryptionPtr *encryption)
{ {
int fd, ret; int fd, ret;
bool encrypted; virStorageFileMetadata meta;
if (encryption) if (encryption)
*encryption = NULL; *encryption = NULL;
@ -455,16 +442,28 @@ virStorageBackendProbeTarget(virConnectPtr conn,
return ret; /* Take care to propagate ret, it is not always -1 */ return ret; /* Take care to propagate ret, it is not always -1 */
} }
if (virStorageGetMetadataFromFD(conn, target->path, fd, memset(&meta, 0, sizeof(meta));
&target->format, &encrypted,
backingStore, capacity) < 0) { if (virStorageGetMetadataFromFD(conn, target->path, fd, &meta) < 0) {
close(fd); close(fd);
return -1; return -1;
} }
close(fd); close(fd);
if (encryption != NULL && encrypted) { target->format = meta.format;
if (backingStore) {
*backingStore = meta.backingStore;
meta.backingStore = NULL;
}
VIR_FREE(meta.backingStore);
if (capacity && meta.capacity)
*capacity = meta.capacity;
if (encryption != NULL && meta.encrypted) {
if (VIR_ALLOC(*encryption) < 0) { if (VIR_ALLOC(*encryption) < 0) {
virReportOOMError(conn); virReportOOMError(conn);
if (backingStore) if (backingStore)

8
src/util/storage_file.h
View File

@ -25,6 +25,7 @@
#define __VIR_STORAGE_FILE_H__ #define __VIR_STORAGE_FILE_H__
#include "util.h" #include "util.h"
#include <stdbool.h>
enum virStorageFileFormat { enum virStorageFileFormat {
VIR_STORAGE_FILE_RAW = 0, VIR_STORAGE_FILE_RAW = 0,
@ -43,4 +44,11 @@ enum virStorageFileFormat {
VIR_ENUM_DECL(virStorageFileFormat); VIR_ENUM_DECL(virStorageFileFormat);
typedef struct _virStorageFileMetadata {
int format;
char *backingStore;
unsigned long long capacity;
bool encrypted;
} virStorageFileMetadata;
#endif /* __VIR_STORAGE_FILE_H__ */ #endif /* __VIR_STORAGE_FILE_H__ */