Isolates cloop probing function as part of the modularization process.
Signed-off-by: Colin Lord <cl...@redhat.com>
---
block/Makefile.objs | 2 +-
block/cloop.c | 16 +---------------
block/probe/cloop.c | 17 +++++++++++++++++
include/block/probe.h | 1 +
4 files changed, 20 insertions(+), 16 deletions(-)
create mode 100644 block/probe/cloop.c
diff --git a/block/Makefile.objs b/block/Makefile.objs
index bc0c2aa..3b98001 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -24,7 +24,7 @@ block-obj-y += accounting.o dirty-bitmap.o
block-obj-y += write-threshold.o
block-obj-y += crypto.o
-block-obj-y += probe/bochs.o
+block-obj-y += probe/bochs.o probe/cloop.o
common-obj-y += stream.o
common-obj-y += commit.o
diff --git a/block/cloop.c b/block/cloop.c
index ea5a92b..bf9fb75 100644
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -25,6 +25,7 @@
#include "qapi/error.h"
#include "qemu-common.h"
#include "block/block_int.h"
+#include "block/probe.h"
#include "qemu/module.h"
#include "qemu/bswap.h"
#include <zlib.h>
@@ -44,21 +45,6 @@ typedef struct BDRVCloopState {
z_stream zstream;
} BDRVCloopState;
-static int cloop_probe(const uint8_t *buf, int buf_size, const char *filename)
-{
- 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);
- if (length > buf_size) {
- length = buf_size;
- }
- if (!memcmp(magic_version_2_0, buf, length)) {
- return 2;
- }
- return 0;
-}
-
static int cloop_open(BlockDriverState *bs, QDict *options, int flags,
Error **errp)
{
diff --git a/block/probe/cloop.c b/block/probe/cloop.c
new file mode 100644
index 0000000..955c29c
--- /dev/null
+++ b/block/probe/cloop.c
@@ -0,0 +1,17 @@
+#include "qemu/osdep.h"
+#include "block/probe.h"
+
+int cloop_probe(const uint8_t *buf, int buf_size, const char *filename)
+{
+ 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);
+ if (length > buf_size) {
+ length = buf_size;
+ }
+ if (!memcmp(magic_version_2_0, buf, length)) {
+ return 2;
+ }
+ return 0;
+}
diff --git a/include/block/probe.h b/include/block/probe.h
index 6450ca1..ed1a60b 100644
--- a/include/block/probe.h
+++ b/include/block/probe.h
@@ -2,5 +2,6 @@
#define PROBE_H
int bochs_probe(const uint8_t *buf, int buf_size, const char *filename);
+int cloop_probe(const uint8_t *buf, int buf_size, const char *filename);
#endif
--
2.5.5
