3:43 a.m.
From: Peter Krempa <pkrempa(a)redhat.com>
Remove the old now-unused infrastructure.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/storage_file/storage_file_probe.c | 66 +++++++--------------------
1 file changed, 16 insertions(+), 50 deletions(-)
diff --git a/src/storage_file/storage_file_probe.c
b/src/storage_file/storage_file_probe.c
index 9fcc052ea3..26f8d63e9a 100644
--- a/src/storage_file/storage_file_probe.c
+++ b/src/storage_file/storage_file_probe.c
@@ -89,13 +89,6 @@ struct FileTypeInfo {
* or NULL if there is no COW base image, to RES;
* return BACKING_STORE_* */
const struct FileEncryptionInfo *cryptInfo; /* Encryption info */
- unsigned long long (*getClusterSize)(const char *buf,
- size_t buf_size);
- int (*getBackingStore)(char **res, int *format,
- const char *buf, size_t buf_size);
- int (*getDataFile)(char **res, virBitmap *features, char *buf, size_t buf_size);
- int (*getFeatures)(virBitmap **features, int format,
- char *buf, ssize_t len);
int (*getImageSpecific)(virStorageSource *meta,
const char *buf,
size_t buf_size);
@@ -250,18 +243,18 @@ static struct FileEncryptionInfo const qcow2EncryptionInfo[] = {
static struct FileTypeInfo const fileTypeInfo[] = {
[VIR_STORAGE_FILE_NONE] = { 0, NULL, LV_LITTLE_ENDIAN,
- -1, 0, {0}, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL
},
+ -1, 0, {0}, 0, 0, 0, NULL, NULL },
[VIR_STORAGE_FILE_RAW] = { 0, NULL, LV_LITTLE_ENDIAN,
-1, 0, {0}, 0, 0, 0,
luksEncryptionInfo,
- NULL, NULL, NULL, NULL, NULL },
+ NULL },
[VIR_STORAGE_FILE_DIR] = { 0, NULL, LV_LITTLE_ENDIAN,
- -1, 0, {0}, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL
},
+ -1, 0, {0}, 0, 0, 0, NULL, NULL },
[VIR_STORAGE_FILE_BOCHS] = {
/*"Bochs Virtual HD Image", */ /* Untested */
0, NULL,
LV_LITTLE_ENDIAN, 64, 4, {0x20000},
- 32+16+16+4+4+4+4+4, 8, 1, NULL, NULL, NULL, NULL, NULL, NULL
+ 32+16+16+4+4+4+4+4, 8, 1, NULL, NULL
},
[VIR_STORAGE_FILE_CLOOP] = {
/* #!/bin/sh
@@ -270,7 +263,7 @@ static struct FileTypeInfo const fileTypeInfo[] = {
*/ /* Untested */
0, NULL,
LV_LITTLE_ENDIAN, -1, 0, {0},
- -1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL
+ -1, 0, 0, NULL, NULL
},
[VIR_STORAGE_FILE_DMG] = {
/* XXX QEMU says there's no magic for dmg,
@@ -278,67 +271,63 @@ static struct FileTypeInfo const fileTypeInfo[] = {
* would have to match) but then disables that check. */
0, NULL,
0, -1, 0, {0},
- -1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL
+ -1, 0, 0, NULL, NULL
},
[VIR_STORAGE_FILE_ISO] = {
32769, "CD001",
LV_LITTLE_ENDIAN, -2, 0, {0},
- -1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL
+ -1, 0, 0, NULL, NULL
},
[VIR_STORAGE_FILE_VPC] = {
0, "conectix",
LV_BIG_ENDIAN, 12, 4, {0x10000},
- 8 + 4 + 4 + 8 + 4 + 4 + 2 + 2 + 4, 8, 1, NULL, NULL, NULL, NULL, NULL, NULL
+ 8 + 4 + 4 + 8 + 4 + 4 + 2 + 2 + 4, 8, 1, NULL, NULL
},
/* TODO: add getBackingStore function */
[VIR_STORAGE_FILE_VDI] = {
64, "\x7f\x10\xda\xbe",
LV_LITTLE_ENDIAN, 68, 4, {0x00010001},
- 64 + 5 * 4 + 256 + 7 * 4, 8, 1, NULL, NULL, NULL, NULL, NULL, NULL},
+ 64 + 5 * 4 + 256 + 7 * 4, 8, 1, NULL, NULL },
/* Not direct file formats, but used for various drivers */
[VIR_STORAGE_FILE_FAT] = { 0, NULL, LV_LITTLE_ENDIAN,
- -1, 0, {0}, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL
},
+ -1, 0, {0}, 0, 0, 0, NULL, NULL },
[VIR_STORAGE_FILE_VHD] = { 0, NULL, LV_LITTLE_ENDIAN,
- -1, 0, {0}, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL
},
+ -1, 0, {0}, 0, 0, 0, NULL, NULL },
[VIR_STORAGE_FILE_PLOOP] = { 0, "WithouFreSpacExt", LV_LITTLE_ENDIAN,
-2, 0, {0}, PLOOP_IMAGE_SIZE_OFFSET, 8,
- PLOOP_SIZE_MULTIPLIER, NULL, NULL, NULL, NULL, NULL,
NULL },
+ PLOOP_SIZE_MULTIPLIER, NULL, NULL },
/* All formats with a backing store probe below here */
[VIR_STORAGE_FILE_COW] = {
0, "OOOM",
LV_BIG_ENDIAN, 4, 4, {2},
- 4+4+1024+4, 8, 1, NULL, NULL, NULL, NULL, NULL, cowGetImageSpecific
+ 4+4+1024+4, 8, 1, NULL, cowGetImageSpecific
},
[VIR_STORAGE_FILE_QCOW] = {
0, "QFI",
LV_BIG_ENDIAN, 4, 4, {1},
QCOWX_HDR_IMAGE_SIZE, 8, 1,
qcow1EncryptionInfo,
- NULL, NULL, NULL, NULL, qcowGetImageSpecific
+ qcowGetImageSpecific
},
[VIR_STORAGE_FILE_QCOW2] = {
0, "QFI",
LV_BIG_ENDIAN, 4, 4, {2, 3},
QCOWX_HDR_IMAGE_SIZE, 8, 1,
qcow2EncryptionInfo,
- NULL,
- NULL,
- NULL,
- NULL,
qcow2GetImageSpecific
},
[VIR_STORAGE_FILE_QED] = {
/* https://wiki.qemu.org/Features/QED */
0, "QED",
LV_LITTLE_ENDIAN, -2, 0, {0},
- QED_HDR_IMAGE_SIZE, 8, 1, NULL, NULL, NULL, NULL, NULL, qedGetImageSpecific
+ QED_HDR_IMAGE_SIZE, 8, 1, NULL, qedGetImageSpecific
},
[VIR_STORAGE_FILE_VMDK] = {
0, "KDMV",
LV_LITTLE_ENDIAN, 4, 4, {1, 2, 3},
- 4+4+4, 8, 512, NULL, NULL, NULL, NULL, NULL, vmdk4GetImageSpecific
+ 4+4+4, 8, 512, NULL, vmdk4GetImageSpecific
},
};
G_STATIC_ASSERT(G_N_ELEMENTS(fileTypeInfo) == VIR_STORAGE_FILE_LAST);
@@ -911,7 +900,6 @@ virStorageFileProbeGetMetadata(virStorageSource *meta,
char *buf,
size_t len)
{
- int format;
size_t i;
VIR_DEBUG("path=%s, buf=%p, len=%zu, meta->format=%d",
@@ -973,32 +961,10 @@ virStorageFileProbeGetMetadata(virStorageSource *meta,
meta->capacity *= fileTypeInfo[meta->format].sizeMultiplier;
}
- VIR_FREE(meta->backingStoreRaw);
- g_clear_pointer(&meta->features, virBitmapFree);
- VIR_FREE(meta->dataFileRaw);
-
if (fileTypeInfo[meta->format].getImageSpecific &&
fileTypeInfo[meta->format].getImageSpecific(meta, buf, len) < 0)
return -1;
- if (fileTypeInfo[meta->format].getClusterSize != NULL)
- meta->clusterSize = fileTypeInfo[meta->format].getClusterSize(buf, len);
-
- if (fileTypeInfo[meta->format].getBackingStore != NULL) {
- fileTypeInfo[meta->format].getBackingStore(&meta->backingStoreRaw,
- &format, buf, len);
- meta->backingStoreRawFormat = format;
- }
-
- if (fileTypeInfo[meta->format].getFeatures != NULL &&
- fileTypeInfo[meta->format].getFeatures(&meta->features,
meta->format, buf, len) < 0)
- return -1;
-
- if (fileTypeInfo[meta->format].getDataFile != NULL) {
- fileTypeInfo[meta->format].getDataFile(&meta->dataFileRaw,
meta->features,
- buf, len);
- }
-
return 0;
}
--
2.49.0