storage_file_probe: Call qcow2GetFeatures from qcow2GetImageSpecific

Parse qcow2 feature flags from qcow2GetImageSpecific. To achieve that
qcow2GetFeatures is refactored to take virStorageSource directly and
fill the data. To avoid the need to pass 'format' the parsing of the
qcow2 version is changed to access the offset directly (same as in
qcow2GetExtensions)

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/storage_file/storage_file_probe.c b/src/storage_file/storage_file_probe.c
index b357fdeb661fd504fd9f7836ce668d3b4c0b2e13..10e159c27b6e6e09aecc16af295976950d494633 100644 (file)
--- a/src/storage_file/storage_file_probe.c
+++ b/src/storage_file/storage_file_probe.c
@@ -115,8 +115,6 @@ qcow2GetImageSpecific(virStorageSource *meta,
                       const char *buf,
                       size_t buf_size);
 static int qcow2GetDataFile(char **, virBitmap *, char *, size_t);
-static int qcow2GetFeatures(virBitmap **features, int format,
-                            char *buf, ssize_t len);
 static int
 vmdk4GetImageSpecific(virStorageSource *meta,
                       const char *buf,
@@ -329,7 +327,7 @@ static struct FileTypeInfo const fileTypeInfo[] = {
         NULL,
         NULL,
         qcow2GetDataFile,
-        qcow2GetFeatures,
+        NULL,
         qcow2GetImageSpecific
     },
     [VIR_STORAGE_FILE_QED] = {
@@ -590,14 +588,13 @@ qcow2GetFeaturesProcessGroup(uint64_t bits,
 
 
 static int
-qcow2GetFeatures(virBitmap **features,
-                 int format,
-                 char *buf,
+qcow2GetFeatures(virStorageSource *meta,
+                 const char *buf,
                  ssize_t len)
 {
-    int version = -1;
+    int version = virReadBufInt32BE(buf + QCOWX_HDR_VERSION);
 
-    version = virReadBufInt32BE(buf + fileTypeInfo[format].versionOffset);
+    g_clear_pointer(&meta->features, virBitmapFree);
 
     if (version == 2)
         return 0;
@@ -605,17 +602,17 @@ qcow2GetFeatures(virBitmap **features,
     if (len < QCOW2v3_HDR_SIZE)
         return -1;
 
-    *features = virBitmapNew(VIR_STORAGE_FILE_FEATURE_LAST);
+    meta->features = virBitmapNew(VIR_STORAGE_FILE_FEATURE_LAST);
 
     qcow2GetFeaturesProcessGroup(virReadBufInt64BE(buf + QCOW2v3_HDR_FEATURES_COMPATIBLE),
                                  qcow2CompatibleFeatureArray,
                                  G_N_ELEMENTS(qcow2CompatibleFeatureArray),
-                                 *features);
+                                 meta->features);
 
     qcow2GetFeaturesProcessGroup(virReadBufInt64BE(buf + QCOW2v3_HDR_FEATURES_INCOMPATIBLE),
                                  qcow2IncompatibleFeatureArray,
                                  G_N_ELEMENTS(qcow2IncompatibleFeatureArray),
-                                 *features);
+                                 meta->features);
 
     return 0;
 }
@@ -639,6 +636,9 @@ qcow2GetImageSpecific(virStorageSource *meta,
     if (qcowXGetBackingStore(meta, buf, buf_size) < 0)
         return -1;
 
+    if (qcow2GetFeatures(meta, buf, buf_size) < 0)
+        return -1;
+
     format = meta->backingStoreRawFormat;
 
     if (qcow2GetExtensions(buf, buf_size, &format, NULL) < 0)