[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 29/32] blockdev: Separate vpc probe from its driv
From: |
Colin Lord |
Subject: |
[Qemu-block] [PATCH v3 29/32] blockdev: Separate vpc probe from its driver |
Date: |
Tue, 5 Jul 2016 11:24:29 -0400 |
Completes the separation of the vpc probe from the vpc driver. The
vpc probe now returns the format in addition to the score, allowing
correlation of the score and driver without the probe function being
part of the driver itself.
Signed-off-by: Colin Lord <address@hidden>
---
block.c | 1 +
block/probe/vpc.c | 15 +++++++++++----
block/vpc.c | 1 -
include/block/probe.h | 3 ++-
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/block.c b/block.c
index 9b839df..8226124 100644
--- a/block.c
+++ b/block.c
@@ -73,6 +73,7 @@ static BdrvProbeFunc *format_probes[] = {
vdi_probe,
vhdx_probe,
vmdk_probe,
+ vpc_probe
};
static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states =
diff --git a/block/probe/vpc.c b/block/probe/vpc.c
index afe8271..0fe8a65 100644
--- a/block/probe/vpc.c
+++ b/block/probe/vpc.c
@@ -1,9 +1,16 @@
#include "qemu/osdep.h"
#include "block/probe.h"
-int vpc_probe(const uint8_t *buf, int buf_size, const char *filename)
+const char *vpc_probe(const uint8_t *buf, int buf_size, const char *filename,
+ int *score)
{
- if (buf_size >= 8 && !strncmp((char *)buf, "conectix", 8))
- return 100;
- return 0;
+ const char *format = "vpc";
+ assert(score);
+ if (buf_size >= 8 && !strncmp((char *)buf, "conectix", 8)) {
+ *score = 100;
+ return format;
+ }
+
+ *score = 0;
+ return format;
}
diff --git a/block/vpc.c b/block/vpc.c
index cb65022..cd87d8f 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -1050,7 +1050,6 @@ static BlockDriver bdrv_vpc = {
.format_name = "vpc",
.instance_size = sizeof(BDRVVPCState),
- .bdrv_probe = vpc_probe,
.bdrv_open = vpc_open,
.bdrv_close = vpc_close,
.bdrv_reopen_prepare = vpc_reopen_prepare,
diff --git a/include/block/probe.h b/include/block/probe.h
index 13df1d3..7facb75 100644
--- a/include/block/probe.h
+++ b/include/block/probe.h
@@ -1,7 +1,6 @@
#ifndef PROBE_H
#define PROBE_H
-int vpc_probe(const uint8_t *buf, int buf_size, const char *filename);
const char *bochs_probe(const uint8_t *buf, int buf_size, const char *filename,
int *score);
const char *cloop_probe(const uint8_t *buf, int buf_size, const char *filename,
@@ -26,5 +25,7 @@ const char *vhdx_probe(const uint8_t *buf, int buf_size,
const char *filename,
int *score);
const char *vmdk_probe(const uint8_t *buf, int buf_size, const char *filename,
int *score);
+const char *vpc_probe(const uint8_t *buf, int buf_size, const char *filename,
+ int *score);
#endif
--
2.5.5
- [Qemu-block] [PATCH v3 25/32] blockdev: Separate raw probe from its driver, (continued)
- [Qemu-block] [PATCH v3 25/32] blockdev: Separate raw probe from its driver, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 28/32] blockdev: Separate vmdk probe from its driver, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 31/32] blockdev: Separate out bdrv_probe_device functions, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 23/32] blockdev: Separate qcow2 probe from its driver, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 32/32] blockdev: Remove bdrv_probe_device field from BlockDriver, Colin Lord, 2016/07/05
- [Qemu-block] [PATCH v3 29/32] blockdev: Separate vpc probe from its driver,
Colin Lord <=
- Re: [Qemu-block] [PATCH v3 00/32] Dynamic module loading for block drivers, John Snow, 2016/07/07
- Re: [Qemu-block] [PATCH v3 00/32] Dynamic module loading for block drivers, Stefan Hajnoczi, 2016/07/14