[v3,21/32] blockdev: Separate parallels probe from its driver

Commit Message

[e-mail] July 5, 2016, 3:24 p.m. UTC

Completes the separation of the parallels probe from the parallels
driver. The parallels 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]>
---
 block.c                 |  1 +
 block/parallels.c       |  1 -
 block/probe/parallels.c | 18 +++++++++++-------
 include/block/probe.h   |  3 ++-
 4 files changed, 14 insertions(+), 9 deletions(-)

Comments

Max Reitz July 6, 2016, 4:08 p.m. UTC | #1

On 05.07.2016 17:24, Colin Lord wrote:
> Completes the separation of the parallels probe from the parallels
> driver. The parallels 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]>
> ---
>  block.c                 |  1 +
>  block/parallels.c       |  1 -
>  block/probe/parallels.c | 18 +++++++++++-------
>  include/block/probe.h   |  3 ++-
>  4 files changed, 14 insertions(+), 9 deletions(-)

Reviewed-by: Max Reitz <[e-mail]>

Patch

diff --git a/block.c b/block.c
index 7dbe201..0f4c9f6 100644
--- a/block.c
+++ b/block.c
@@ -65,6 +65,7 @@  static BdrvProbeFunc *format_probes[] = {
     cloop_probe,
     block_crypto_probe_luks,
     dmg_probe,
+    parallels_probe,
 };
 
 static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states =
diff --git a/block/parallels.c b/block/parallels.c
index 547373e..6994c41 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -709,7 +709,6 @@  static QemuOptsList parallels_create_opts = {
 static BlockDriver bdrv_parallels = {
     .format_name	= "parallels",
     .instance_size	= sizeof(BDRVParallelsState),
-    .bdrv_probe		= parallels_probe,
     .bdrv_open		= parallels_open,
     .bdrv_close		= parallels_close,
     .bdrv_co_get_block_status = parallels_co_get_block_status,
diff --git a/block/probe/parallels.c b/block/probe/parallels.c
index 66cddea..3ebeddd 100644
--- a/block/probe/parallels.c
+++ b/block/probe/parallels.c
@@ -3,20 +3,24 @@ 
 #include "block/probe.h"
 #include "block/driver/parallels.h"
 
-int parallels_probe(const uint8_t *buf, int buf_size,
-                           const char *filename)
+const char *parallels_probe(const uint8_t *buf, int buf_size,
+                            const char *filename, int *score)
 {
+    const char *format = "parallels";
     const ParallelsHeader *ph = (const void *)buf;
+    assert(score);
+    *score = 0;
 
     if (buf_size < sizeof(ParallelsHeader)) {
-        return 0;
+        return format;
     }
 
     if ((!memcmp(ph->magic, HEADER_MAGIC, 16) ||
-           !memcmp(ph->magic, HEADER_MAGIC2, 16)) &&
-           (le32_to_cpu(ph->version) == HEADER_VERSION)) {
-        return 100;
+        !memcmp(ph->magic, HEADER_MAGIC2, 16)) &&
+        (le32_to_cpu(ph->version) == HEADER_VERSION)) {
+        *score = 100;
+        return format;
     }
 
-    return 0;
+    return format;
 }
diff --git a/include/block/probe.h b/include/block/probe.h
index ef6629f..7383a64 100644
--- a/include/block/probe.h
+++ b/include/block/probe.h
@@ -1,7 +1,6 @@ 
 #ifndef PROBE_H
 #define PROBE_H
 
-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);
 int bdrv_qed_probe(const uint8_t *buf, int buf_size, const char *filename);
@@ -18,5 +17,7 @@  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);
+const char *parallels_probe(const uint8_t *buf, int buf_size,
+                            const char *filename, int *score);
 
 #endif