Isolate raw probe as part of the modularization process. Signed-off-by: Colin Lord <cl...@redhat.com> Reviewed-by: Max Reitz <mre...@redhat.com> --- block/Makefile.objs | 1 + block/raw-probe.c | 10 ++++++++++ block/raw_bsd.c | 9 +-------- include/block/probe.h | 1 + 4 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 block/raw-probe.c
diff --git a/block/Makefile.objs b/block/Makefile.objs index db9faef..07b0a2d 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 += bochs-probe.o cloop-probe.o crypto-probe.o dmg-probe.o block-obj-y += parallels-probe.o qcow-probe.o qcow2-probe.o qed-probe.o +block-obj-y += raw-probe.o common-obj-y += stream.o common-obj-y += backup.o diff --git a/block/raw-probe.c b/block/raw-probe.c new file mode 100644 index 0000000..22c6bcb --- /dev/null +++ b/block/raw-probe.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 5f9dd29..25d5185 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" @@ -213,14 +214,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