External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-09 14:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Log warning if storage magic matches, but version does not

Browse Source 
To help us detect when new storage file versions come into
existance log a warning if the storage file magic matches,
but the version does not

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2012-12-13 14:22:51 +00:00
parent f6bd0a8899
commit dfba37048a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/util/storage_file.c
View File

@ -756,16 +756,26 @@ virStorageFileProbeFormatFromBuf(const char *path,
{ {
int format = VIR_STORAGE_FILE_RAW; int format = VIR_STORAGE_FILE_RAW;
int i; int i;
int possibleFormat = VIR_STORAGE_FILE_RAW;
VIR_DEBUG("path=%s", path);
/* First check file magic */ /* First check file magic */
for (i = 0 ; i < VIR_STORAGE_FILE_LAST ; i++) { for (i = 0 ; i < VIR_STORAGE_FILE_LAST ; i++) {
if (virStorageFileMatchesMagic(i, buf, buflen) && if (virStorageFileMatchesMagic(i, buf, buflen)) {
virStorageFileMatchesVersion(i, buf, buflen)) { if (!virStorageFileMatchesVersion(i, buf, buflen)) {
possibleFormat = i;
continue;
}
format = i; format = i;
goto cleanup; goto cleanup;
} }
} }
if (possibleFormat != VIR_STORAGE_FILE_RAW)
VIR_WARN("File %s matches %s magic, but version is wrong. "
"Please report new version to libvir-list@redhat.com",
path, virStorageFileFormatTypeToString(possibleFormat));
/* No magic, so check file extension */ /* No magic, so check file extension */
for (i = 0 ; i < VIR_STORAGE_FILE_LAST ; i++) { for (i = 0 ; i < VIR_STORAGE_FILE_LAST ; i++) {
if (virStorageFileMatchesExtension(i, path)) { if (virStorageFileMatchesExtension(i, path)) {