[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 12/32] blockdev: Move raw probe to its own file
From: |
Colin Lord |
Subject: |
[Qemu-block] [PATCH v3 12/32] blockdev: Move raw probe to its own file |
Date: |
Tue, 5 Jul 2016 11:24:12 -0400 |
Isolate raw probe as part of the modularization process.
Signed-off-by: Colin Lord <address@hidden>
---
block/Makefile.objs | 1 +
block/probe/raw.c | 10 ++++++++++
block/raw_bsd.c | 9 +--------
include/block/probe.h | 1 +
4 files changed, 13 insertions(+), 8 deletions(-)
create mode 100644 block/probe/raw.c
diff --git a/block/Makefile.objs b/block/Makefile.objs
index 6ed2689..693cc97 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -26,6 +26,7 @@ block-obj-y += write-threshold.o
block-obj-y += crypto.o
block-obj-y += probe/bochs.o probe/cloop.o probe/luks.o probe/dmg.o
block-obj-y += probe/parallels.o probe/qcow.o probe/qcow2.o probe/qed.o
+block-obj-y += probe/raw.o
common-obj-y += stream.o
common-obj-y += commit.o
diff --git a/block/probe/raw.c b/block/probe/raw.c
new file mode 100644
index 0000000..22c6bcb
--- /dev/null
+++ b/block/probe/raw.c
@@ -0,0 +1,10 @@
+#include "qemu/osdep.h"
+#include "block/probe.h"
+
+int raw_probe(const uint8_t *buf, int buf_size, const char *filename)
+{
+ /* smallest possible positive score so that raw is used if and only if no
+ * other block driver works
+ */
+ return 1;
+}
diff --git a/block/raw_bsd.c b/block/raw_bsd.c
index 7f63791..8f49637 100644
--- a/block/raw_bsd.c
+++ b/block/raw_bsd.c
@@ -28,6 +28,7 @@
#include "qemu/osdep.h"
#include "block/block_int.h"
+#include "block/probe.h"
#include "qapi/error.h"
#include "qemu/option.h"
@@ -218,14 +219,6 @@ static void raw_close(BlockDriverState *bs)
{
}
-static int raw_probe(const uint8_t *buf, int buf_size, const char *filename)
-{
- /* smallest possible positive score so that raw is used if and only if no
- * other block driver works
- */
- return 1;
-}
-
static int raw_probe_blocksizes(BlockDriverState *bs, BlockSizes *bsz)
{
return bdrv_probe_blocksizes(bs->file->bs, bsz);
diff --git a/include/block/probe.h b/include/block/probe.h
index e3e9934..053f961 100644
--- a/include/block/probe.h
+++ b/include/block/probe.h
@@ -10,5 +10,6 @@ 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);
+int raw_probe(const uint8_t *buf, int buf_size, const char *filename);
#endif
--
2.5.5