[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 18/32] blockdev: Separate cloop probe from its dr
From: |
Colin Lord |
Subject: |
[Qemu-block] [PATCH v3 18/32] blockdev: Separate cloop probe from its driver |
Date: |
Tue, 5 Jul 2016 11:24:18 -0400 |
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 <address@hidden>
---
block.c | 1 +
block/cloop.c | 1 -
block/probe/cloop.c | 11 ++++++++---
include/block/probe.h | 3 ++-
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/block.c b/block.c
index eab8a6e..baef612 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[] = {
bochs_probe,
+ cloop_probe,
};
static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states =
diff --git a/block/cloop.c b/block/cloop.c
index bf9fb75..b5db80b 100644
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -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,
diff --git a/block/probe/cloop.c b/block/probe/cloop.c
index 955c29c..b9c2605 100644
--- a/block/probe/cloop.c
+++ b/block/probe/cloop.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 *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/include/block/probe.h b/include/block/probe.h
index 13c08bd..804f77c 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 *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
--
2.5.5
- [Qemu-block] [PATCH v3 16/32] blockdev: Move vpc probe to its own file, (continued)
- [Qemu-block] [PATCH v3 16/32] blockdev: Move vpc probe to its own file, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 11/32] blockdev: Move qed probe to its own file, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 14/32] blockdev: Move vhdx probe to its own file, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 15/32] blockdev: Move vmdk probe to its own file, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 20/32] blockdev: Separate dmg probe from its driver, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 18/32] blockdev: Separate cloop probe from its driver,
Colin Lord <=
- [Qemu-block] [PATCH v3 22/32] blockdev: Separate qcow probe from its driver, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 26/32] blockdev: Separate vdi probe from its driver, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 30/32] blockdev: Remove the .bdrv_probe field from BlockDrivers, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 27/32] blockdev: Separate vhdx probe from its driver, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 21/32] blockdev: Separate parallels probe from its driver, Colin Lord, 2016/07/05