[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 11/32] blockdev: Move qed probe to its own file
From: |
Colin Lord |
Subject: |
[Qemu-block] [PATCH v3 11/32] blockdev: Move qed probe to its own file |
Date: |
Tue, 5 Jul 2016 11:24:11 -0400 |
Isolate qed probe as part of the modularization process.
Signed-off-by: Colin Lord <address@hidden>
---
block/Makefile.objs | 2 +-
block/probe/qed.c | 18 ++++++++++++++++++
block/qed.c | 15 +--------------
include/block/probe.h | 1 +
4 files changed, 21 insertions(+), 15 deletions(-)
create mode 100644 block/probe/qed.c
diff --git a/block/Makefile.objs b/block/Makefile.objs
index 23240d9..6ed2689 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -25,7 +25,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
+block-obj-y += probe/parallels.o probe/qcow.o probe/qcow2.o probe/qed.o
common-obj-y += stream.o
common-obj-y += commit.o
diff --git a/block/probe/qed.c b/block/probe/qed.c
new file mode 100644
index 0000000..c902489
--- /dev/null
+++ b/block/probe/qed.c
@@ -0,0 +1,18 @@
+#include "qemu/osdep.h"
+#include "block/block_int.h"
+#include "block/probe.h"
+#include "block/qed.h"
+
+int bdrv_qed_probe(const uint8_t *buf, int buf_size,
+ const char *filename)
+{
+ const QEDHeader *header = (const QEDHeader *)buf;
+
+ if (buf_size < sizeof(*header)) {
+ return 0;
+ }
+ if (le32_to_cpu(header->magic) != QED_MAGIC) {
+ return 0;
+ }
+ return 100;
+}
diff --git a/block/qed.c b/block/qed.c
index 1206806..21d8982 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -16,6 +16,7 @@
#include "qapi/error.h"
#include "qemu/timer.h"
#include "qemu/bswap.h"
+#include "block/probe.h"
#include "trace.h"
#include "qed.h"
#include "qapi/qmp/qerror.h"
@@ -26,20 +27,6 @@ static const AIOCBInfo qed_aiocb_info = {
.aiocb_size = sizeof(QEDAIOCB),
};
-static int bdrv_qed_probe(const uint8_t *buf, int buf_size,
- const char *filename)
-{
- const QEDHeader *header = (const QEDHeader *)buf;
-
- if (buf_size < sizeof(*header)) {
- return 0;
- }
- if (le32_to_cpu(header->magic) != QED_MAGIC) {
- return 0;
- }
- return 100;
-}
-
/**
* Check whether an image format is raw
*
diff --git a/include/block/probe.h b/include/block/probe.h
index f9dd36e..e3e9934 100644
--- a/include/block/probe.h
+++ b/include/block/probe.h
@@ -9,5 +9,6 @@ int dmg_probe(const uint8_t *buf, int buf_size, const char
*filename);
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);
#endif
--
2.5.5
- Re: [Qemu-block] [PATCH v3 12/32] blockdev: Move raw probe to its own file, (continued)
- [Qemu-block] [PATCH v3 19/32] blockdev: Separate luks probe from its driver, Colin Lord, 2016/07/05
- [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 <=
- [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, 2016/07/05
- [Qemu-block] [PATCH v3 22/32] blockdev: Separate qcow probe from its driver, Colin Lord, 2016/07/05