[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 16/32] blockdev: Move vpc probe to its own file
From: |
Colin Lord |
Subject: |
[Qemu-devel] [PATCH v3 16/32] blockdev: Move vpc probe to its own file |
Date: |
Tue, 5 Jul 2016 11:24:16 -0400 |
Isolates vpc probe as part of the modularization process.
Signed-off-by: Colin Lord <address@hidden>
---
block/Makefile.objs | 2 +-
block/probe/vpc.c | 9 +++++++++
block/vpc.c | 8 +-------
include/block/probe.h | 1 +
4 files changed, 12 insertions(+), 8 deletions(-)
create mode 100644 block/probe/vpc.c
diff --git a/block/Makefile.objs b/block/Makefile.objs
index 4cecf68..2d2691e 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -26,7 +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 probe/vdi.o probe/vhdx.o probe/vmdk.o
+block-obj-y += probe/raw.o probe/vdi.o probe/vhdx.o probe/vmdk.o probe/vpc.o
common-obj-y += stream.o
common-obj-y += commit.o
diff --git a/block/probe/vpc.c b/block/probe/vpc.c
new file mode 100644
index 0000000..afe8271
--- /dev/null
+++ b/block/probe/vpc.c
@@ -0,0 +1,9 @@
+#include "qemu/osdep.h"
+#include "block/probe.h"
+
+int vpc_probe(const uint8_t *buf, int buf_size, const char *filename)
+{
+ if (buf_size >= 8 && !strncmp((char *)buf, "conectix", 8))
+ return 100;
+ return 0;
+}
diff --git a/block/vpc.c b/block/vpc.c
index 076a7ce..cb65022 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -26,6 +26,7 @@
#include "qapi/error.h"
#include "qemu-common.h"
#include "block/block_int.h"
+#include "block/probe.h"
#include "sysemu/block-backend.h"
#include "qemu/module.h"
#include "migration/migration.h"
@@ -179,13 +180,6 @@ static uint32_t vpc_checksum(uint8_t* buf, size_t size)
}
-static int vpc_probe(const uint8_t *buf, int buf_size, const char *filename)
-{
- if (buf_size >= 8 && !strncmp((char *)buf, "conectix", 8))
- return 100;
- return 0;
-}
-
static void vpc_parse_options(BlockDriverState *bs, QemuOpts *opts,
Error **errp)
{
diff --git a/include/block/probe.h b/include/block/probe.h
index 392515d..6cf878b 100644
--- a/include/block/probe.h
+++ b/include/block/probe.h
@@ -14,5 +14,6 @@ int raw_probe(const uint8_t *buf, int buf_size, const char
*filename);
int vdi_probe(const uint8_t *buf, int buf_size, const char *filename);
int vhdx_probe(const uint8_t *buf, int buf_size, const char *filename);
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);
#endif
--
2.5.5
- [Qemu-devel] [PATCH v3 26/32] blockdev: Separate vdi probe from its driver, (continued)
- [Qemu-devel] [PATCH v3 26/32] blockdev: Separate vdi probe from its driver, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 29/32] blockdev: Separate vpc probe from its driver, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 31/32] blockdev: Separate out bdrv_probe_device functions, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 30/32] blockdev: Remove the .bdrv_probe field from BlockDrivers, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 32/32] blockdev: Remove bdrv_probe_device field from BlockDriver, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 16/32] blockdev: Move vpc probe to its own file,
Colin Lord <=
- [Qemu-devel] [PATCH v3 17/32] blockdev: Separate bochs probe from its driver, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 22/32] blockdev: Separate qcow probe from its driver, Colin Lord, 2016/07/05
- [Qemu-devel] [PATCH v3 21/32] blockdev: Separate parallels probe from its driver, Colin Lord, 2016/07/05