[Qemu-devel] [PATCH v3 20/32] blockdev: Separate dmg probe from its driver

[Colin Lord]

Completes the separation of the dmg probe from the dmg driver. The dmg
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 <cl...@redhat.com>
---
 block.c               |  1 +
 block/dmg.c           |  1 -
 block/probe/dmg.c     | 13 +++++++++----
 include/block/probe.h |  3 ++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/block.c b/block.c
index d936da1..7dbe201 100644
--- a/block.c
+++ b/block.c
@@ -64,6 +64,7 @@ static BdrvProbeFunc *format_probes[] = {
     bochs_probe,
     cloop_probe,
     block_crypto_probe_luks,
+    dmg_probe,
 };
 
 static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states =
diff --git a/block/dmg.c b/block/dmg.c
index 2c70687..945cc00 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -704,7 +704,6 @@ static void dmg_close(BlockDriverState *bs)
 static BlockDriver bdrv_dmg = {
     .format_name    = "dmg",
     .instance_size  = sizeof(BDRVDMGState),
-    .bdrv_probe     = dmg_probe,
     .bdrv_open      = dmg_open,
     .bdrv_co_preadv = dmg_co_preadv,
     .bdrv_close     = dmg_close,
diff --git a/block/probe/dmg.c b/block/probe/dmg.c
index a40281b..5415b04 100644
--- a/block/probe/dmg.c
+++ b/block/probe/dmg.c
@@ -1,17 +1,22 @@
 #include "qemu/osdep.h"
 #include "block/probe.h"
 
-int dmg_probe(const uint8_t *buf, int buf_size, const char *filename)
+const char *dmg_probe(const uint8_t *buf, int buf_size, const char *filename,
+                     int *score)
 {
+    const char *format = "dmg";
     int len;
+    assert(score);
+    *score = 0;
 
     if (!filename) {
-        return 0;
+        return format;
     }
 
     len = strlen(filename);
     if (len > 4 && !strcmp(filename + len - 4, ".dmg")) {
-        return 2;
+        *score = 2;
+        return format;
     }
-    return 0;
+    return format;
 }
diff --git a/include/block/probe.h b/include/block/probe.h
index e3bf04e..ef6629f 100644
--- a/include/block/probe.h
+++ b/include/block/probe.h
@@ -1,7 +1,6 @@
 #ifndef PROBE_H
 #define PROBE_H
 
-int dmg_probe(const uint8_t *buf, int buf_size, const char *filename);
 int parallels_probe(const uint8_t *buf, int buf_size, const char *filename);
 int qcow_probe(const uint8_t *buf, int buf_size, const char *filename);
 int qcow2_probe(const uint8_t *buf, int buf_size, const char *filename);
@@ -17,5 +16,7 @@ const char *cloop_probe(const uint8_t *buf, int buf_size, 
const char *filename,
                         int *score);
 const char *block_crypto_probe_luks(const uint8_t *buf, int buf_size,
                                     const char *filename, int *score);
+const char *dmg_probe(const uint8_t *buf, int buf_size, const char *filename,
+                      int *score);
 
 #endif
-- 
2.5.5