openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

util: virstorage: Kill struct virStorageFileMetadata 

Remove the now unused pieces of the structure.
This commit is contained in:
Peter Krempa 2014-04-17 16:15:45 +02:00
parent d64d9ff948
commit 4905b983ea
3 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libvirt_private.syms
View File

@ -1823,7 +1823,6 @@ virStorageFileFeatureTypeFromString;
virStorageFileFeatureTypeToString;
virStorageFileFormatTypeFromString;
virStorageFileFormatTypeToString;
virStorageFileFreeMetadata;
virStorageFileGetLVMKey;
virStorageFileGetMetadata;
virStorageFileGetMetadataFromBuf;

23
src/util/virstoragefile.c
View File

@ -1312,29 +1312,6 @@ virStorageFileChainGetBroken(virStorageSourcePtr chain,
}
/**
* virStorageFileMetadataFree:
*
* Free pointers in passed structure and structure itself.
*/
void
virStorageFileFreeMetadata(virStorageFileMetadata *meta)
{
if (!meta)
return;
VIR_FREE(meta->relPath);
VIR_FREE(meta->path);
VIR_FREE(meta->relDir);
virStorageFileFreeMetadata(meta->backingMeta);
VIR_FREE(meta->backingStoreRaw);
VIR_FREE(meta->compat);
virBitmapFree(meta->features);
virStorageEncryptionFree(meta->encryption);
VIR_FREE(meta);
}
/**
* virStorageFileResize:
*

37
src/util/virstoragefile.h
View File

@ -116,41 +116,6 @@ struct _virStorageTimestamps {
};
typedef struct _virStorageFileMetadata virStorageFileMetadata;
typedef virStorageFileMetadata *virStorageFileMetadataPtr;
struct _virStorageFileMetadata {
/* Name of the current file as spelled by the user (top level) or
* metadata of the overlay (if this is a backing store). */
char *relPath;
/* Canonical name of the current file, used to detect loops in the
* backing store chain. */
char *path;
/* Directory to start from if backingStoreRaw is a relative file
* name. */
char *relDir;
/* Name of the child backing store recorded in metadata of the
* current file. */
char *backingStoreRaw;
/* Backing chain. In the common case, the child's
* backingMeta->path will be a duplicate of this file's
* backingStoreRaw; this setup makes it possible to detect missing
* backing files: if backingStoreRaw is NULL, this field should be
* NULL. If this field is NULL and backingStoreRaw is non-NULL,
* there was an error following the chain (such as a missing
* file). Otherwise, information about the child is here. */
virStorageFileMetadataPtr backingMeta;
/* Details about the current image */
int type; /* enum virStorageType */
int format; /* enum virStorageFileFormat */
virStorageEncryptionPtr encryption;
unsigned long long capacity;
virBitmapPtr features; /* bits described by enum virStorageFileFeature */
char *compat;
};
/* Information related to network storage */
enum virStorageNetProtocol {
VIR_STORAGE_NET_PROTOCOL_NBD,
@ -323,8 +288,6 @@ const char *virStorageFileChainLookup(virStorageSourcePtr chain,
const char **parent)
ATTRIBUTE_NONNULL(1);
void virStorageFileFreeMetadata(virStorageFileMetadataPtr meta);
int virStorageFileResize(const char *path,
unsigned long long capacity,
unsigned long long orig_capacity,