@@ -62,6 +62,7 @@ typedef const char *BdrvProbeFunc(const uint8_t *buf, int buf_size,
static BdrvProbeFunc *format_probes[] = {
bochs_probe,
+ cloop_probe,
};
static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states =
@@ -264,7 +264,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_co_preadv = cloop_co_preadv,
.bdrv_close = cloop_close,
@@ -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 *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;
}
@@ -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 *bochs_probe(const uint8_t *buf, int buf_size, const char *filename,
int *score);
+const char *cloop_probe(const uint8_t *buf, int buf_size, const char *filename,
+ int *score);
#endif
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 <clord@redhat.com> --- block.c | 1 + block/cloop.c | 1 - block/probe/cloop.c | 11 ++++++++--- include/block/probe.h | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-)