[v4,18/32] blockdev: Separate cloop probe from its driver

Commit Message

[e-mail] July 14, 2016, 7:03 p.m. UTC

Completes the separation of the cloop probe from the cloop driver. The
cloop 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 <[e-mail]>
Reviewed-by: Max Reitz <[e-mail]>
---
 block.c               |  1 +
 block/cloop-probe.c   | 11 ++++++++---
 block/cloop.c         |  1 -
 include/block/probe.h |  3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)

Patch

diff --git a/block.c b/block.c
index b16f8cf..8d21f87 100644
--- a/block.c
+++ b/block.c
@@ -62,6 +62,7 @@  typedef const char *BdrvProbeFunc(const uint8_t *buf, int buf_size,
 
 static BdrvProbeFunc *format_probes[] = {
     bdrv_bochs_probe,
+    bdrv_cloop_probe,
 };
 
 static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states =
diff --git a/block/cloop-probe.c b/block/cloop-probe.c
index 955c29c..779b377 100644
--- a/block/cloop-probe.c
+++ b/block/cloop-probe.c
@@ -1,17 +1,22 @@ 
 #include "qemu/osdep.h"
 #include "block/probe.h"
 
-int cloop_probe(const uint8_t *buf, int buf_size, const char *filename)
+const char *bdrv_cloop_probe(const uint8_t *buf, int buf_size,
+                             const char *filename, int *score)
 {
+    const char *format = "cloop";
     const char *magic_version_2_0 = "#!/bin/sh\n"
         "#V2.0 Format\n"
         "modprobe cloop file=$0 && mount -r -t iso9660 /dev/cloop $1\n";
     int length = strlen(magic_version_2_0);
+    assert(score);
     if (length > buf_size) {
         length = buf_size;
     }
     if (!memcmp(magic_version_2_0, buf, length)) {
-        return 2;
+        *score = 2;
+        return format;
     }
-    return 0;
+    *score = 0;
+    return format;
 }
diff --git a/block/cloop.c b/block/cloop.c
index c897e58..a2555d3 100644
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -268,7 +268,6 @@  static void cloop_close(BlockDriverState *bs)
 static BlockDriver bdrv_cloop = {
     .format_name    = "cloop",
     .instance_size  = sizeof(BDRVCloopState),
-    .bdrv_probe     = cloop_probe,
     .bdrv_open      = cloop_open,
     .bdrv_refresh_limits = cloop_refresh_limits,
     .bdrv_co_preadv = cloop_co_preadv,
diff --git a/include/block/probe.h b/include/block/probe.h
index aac1fca..e434af5 100644
--- a/include/block/probe.h
+++ b/include/block/probe.h
@@ -1,7 +1,6 @@ 
 #ifndef PROBE_H
 #define PROBE_H
 
-int cloop_probe(const uint8_t *buf, int buf_size, const char *filename);
 int block_crypto_probe_luks(const uint8_t *buf, int buf_size,
                             const char *filename);
 int dmg_probe(const uint8_t *buf, int buf_size, const char *filename);
@@ -16,5 +15,7 @@  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);
+const char *bdrv_cloop_probe(const uint8_t *buf, int buf_size,
+                             const char *filename, int *score);
 
 #endif