External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: Determine the local storage type right away

Browse Source 
When walking the backing chain we previously set the storage type to
_FILE and let the virStorageFileGetMetadataFromFDInternal update it to
the correct type later on.

This patch moves the actual storage type determination to the place
where we parse the backing store name so that the code can later be
switched to use virStorageFileReadHeader() directly.
This commit is contained in:
Peter Krempa 2014-04-25 15:16:25 +02:00
parent 713cc3b0a7
commit d4c0ceae1b
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/storage/storage_driver.c
View File

@ -3111,6 +3111,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
{
int fd;
int ret = -1;
struct stat st;
virStorageSourcePtr backingStore = NULL;
int backingFormat;
@ -3173,6 +3174,16 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
ret = 0;
goto cleanup;
}
/* update the type for local storage */
if (stat(backingStore->path, &st) == 0) {
if (S_ISDIR(st.st_mode)) {
backingStore->type = VIR_STORAGE_TYPE_DIR;
backingStore->format = VIR_STORAGE_FILE_DIR;
} else if (S_ISBLK(st.st_mode)) {
backingStore->type = VIR_STORAGE_TYPE_BLOCK;
}
}
} else {
/* TODO: To satisfy the test case, copy the network URI as path. This
* will be removed later. */