diff mbox

[v4,20/32] blockdev: Separate dmg probe from its driver

Message ID 1468523008-30013-21-git-send-email-clord@redhat.com
State New
Headers show

Commit Message

clord@redhat.com July 14, 2016, 7:03 p.m. UTC 
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 <clord@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
 block.c               |  1 +
 block/dmg-probe.c     | 13 +++++++++----
 block/dmg.c           |  1 -
 include/block/probe.h |  3 ++-
 4 files changed, 12 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/block.c b/block.c
index 6a144cc..f7dc4a4 100644
--- a/block.c
+++ b/block.c
@@ -64,6 +64,7 @@  static BdrvProbeFunc *format_probes[] = {
     bdrv_bochs_probe,
     bdrv_cloop_probe,
     bdrv_crypto_probe_luks,
+    bdrv_dmg_probe,
 };
 
 static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states =
diff --git a/block/dmg-probe.c b/block/dmg-probe.c
index a40281b..cc6efa8 100644
--- a/block/dmg-probe.c
+++ b/block/dmg-probe.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 *bdrv_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/block/dmg.c b/block/dmg.c
index 4bbb079..8e50a6b 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -709,7 +709,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_refresh_limits = dmg_refresh_limits,
     .bdrv_co_preadv = dmg_co_preadv,
diff --git a/include/block/probe.h b/include/block/probe.h
index b15dd91..bd5a532 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 *bdrv_cloop_probe(const uint8_t *buf, int buf_size,
                              const char *filename, int *score);
 const char *bdrv_crypto_probe_luks(const uint8_t *buf, int buf_size,
                                    const char *filename, int *score);
+const char *bdrv_dmg_probe(const uint8_t *buf, int buf_size,
+                           const char *filename, int *score);
 
 #endif