[Qemu-devel] [PATCH v4 28/32] blockdev: Separate vmdk probe from its driver

[Colin Lord]

Completes the separation of the vmdk probe from the vmdk driver. The
vmdk probe now returns the format in addition to the score, allowing
correlation of the score and driver without the probe function being
part of the driver itself.

Signed-off-by: Colin Lord <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
 block.c               |  1 +
 block/vmdk-probe.c    | 23 +++++++++++++++--------
 block/vmdk.c          |  1 -
 include/block/probe.h |  3 ++-
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/block.c b/block.c
index 941e208..bb2faf8 100644
--- a/block.c
+++ b/block.c
@@ -72,6 +72,7 @@ static BdrvProbeFunc *format_probes[] = {
     bdrv_raw_probe,
     bdrv_vdi_probe,
     bdrv_vhdx_probe,
+    bdrv_vmdk_probe,
 };
 
 static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states =
diff --git a/block/vmdk-probe.c b/block/vmdk-probe.c
index 77b06af..86d6f46 100644
--- a/block/vmdk-probe.c
+++ b/block/vmdk-probe.c
@@ -3,17 +3,22 @@
 #include "block/probe.h"
 #include "vmdk.h"
 
-int vmdk_probe(const uint8_t *buf, int buf_size, const char *filename)
+const char *bdrv_vmdk_probe(const uint8_t *buf, int buf_size,
+                            const char *filename, int *score)
 {
+    const char *format = "vmdk";
     uint32_t magic;
+    assert(score);
+    *score = 0;
 
     if (buf_size < 4) {
-        return 0;
+        return format;
     }
     magic = be32_to_cpu(*(uint32_t *)buf);
     if (magic == VMDK3_MAGIC ||
         magic == VMDK4_MAGIC) {
-        return 100;
+        *score = 100;
+        return format;
     } else {
         const char *p = (const char *)buf;
         const char *end = p + buf_size;
@@ -36,7 +41,7 @@ int vmdk_probe(const uint8_t *buf, int buf_size, const char 
*filename)
                 }
                 /* only accept blank lines before 'version=' line */
                 if (p == end || *p != '\n') {
-                    return 0;
+                    return format;
                 }
                 p++;
                 continue;
@@ -44,17 +49,19 @@ int vmdk_probe(const uint8_t *buf, int buf_size, const char 
*filename)
             if (end - p >= strlen("version=X\n")) {
                 if (strncmp("version=1\n", p, strlen("version=1\n")) == 0 ||
                     strncmp("version=2\n", p, strlen("version=2\n")) == 0) {
-                    return 100;
+                    *score = 100;
+                    return format;
                 }
             }
             if (end - p >= strlen("version=X\r\n")) {
                 if (strncmp("version=1\r\n", p, strlen("version=1\r\n")) == 0 
||
                     strncmp("version=2\r\n", p, strlen("version=2\r\n")) == 0) 
{
-                    return 100;
+                    *score = 100;
+                    return format;
                 }
             }
-            return 0;
+            return format;
         }
-        return 0;
+        return format;
     }
 }
diff --git a/block/vmdk.c b/block/vmdk.c
index d2699b0..fb33362 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -2331,7 +2331,6 @@ static QemuOptsList vmdk_create_opts = {
 static BlockDriver bdrv_vmdk = {
     .format_name                  = "vmdk",
     .instance_size                = sizeof(BDRVVmdkState),
-    .bdrv_probe                   = vmdk_probe,
     .bdrv_open                    = vmdk_open,
     .bdrv_check                   = vmdk_check,
     .bdrv_reopen_prepare          = vmdk_reopen_prepare,
diff --git a/include/block/probe.h b/include/block/probe.h
index b7eb00e..8f2c26c 100644
--- a/include/block/probe.h
+++ b/include/block/probe.h
@@ -1,7 +1,6 @@
 #ifndef PROBE_H
 #define PROBE_H
 
-int vmdk_probe(const uint8_t *buf, int buf_size, const char *filename);
 int vpc_probe(const uint8_t *buf, int buf_size, const char *filename);
 const char *bdrv_bochs_probe(const uint8_t *buf, int buf_size,
                              const char *filename, int *score);
@@ -25,5 +24,7 @@ const char *bdrv_vdi_probe(const uint8_t *buf, int buf_size,
                            const char *filename, int *score);
 const char *bdrv_vhdx_probe(const uint8_t *buf, int buf_size,
                             const char *filename, int *score);
+const char *bdrv_vmdk_probe(const uint8_t *buf, int buf_size,
+                            const char *filename, int *score);
 
 #endif
-- 
2.5.5