External/libvirt
1
0
Fork 0
Code

storage: use G_GNUC_UNUSED

Browse Source 
Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2019-10-14 14:45:33 +02:00
parent bfefd2cb09
commit cdf7be47c0
9 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/storage_backend.c
View File

@ -106,7 +106,7 @@ virStorageDriverLoadBackendModule(const char *name,
return -1 return -1
int int
virStorageBackendDriversRegister(bool allbackends ATTRIBUTE_UNUSED) virStorageBackendDriversRegister(bool allbackends G_GNUC_UNUSED)
{ {
#if WITH_STORAGE_DIR || WITH_STORAGE_FS #if WITH_STORAGE_DIR || WITH_STORAGE_FS
VIR_STORAGE_BACKEND_REGISTER(virStorageBackendFsRegister, "fs"); VIR_STORAGE_BACKEND_REGISTER(virStorageBackendFsRegister, "fs");

6
src/storage/storage_backend_disk.c
View File

@ -41,7 +41,7 @@ VIR_LOG_INIT("storage.storage_backend_disk");
static bool static bool
virStorageVolPartFindExtended(virStorageVolDefPtr def, virStorageVolPartFindExtended(virStorageVolDefPtr def,
const void *opaque ATTRIBUTE_UNUSED) const void *opaque G_GNUC_UNUSED)
{ {
if (def->source.partType == VIR_STORAGE_VOL_DISK_TYPE_EXTENDED) if (def->source.partType == VIR_STORAGE_VOL_DISK_TYPE_EXTENDED)
return true; return true;
@ -286,7 +286,7 @@ struct virStorageBackendDiskPoolVolData {
}; };
static int static int
virStorageBackendDiskMakeVol(size_t ntok ATTRIBUTE_UNUSED, virStorageBackendDiskMakeVol(size_t ntok G_GNUC_UNUSED,
char **const groups, char **const groups,
void *opaque) void *opaque)
{ {
@ -391,7 +391,7 @@ virStorageBackendDiskReadPartitions(virStoragePoolObjPtr pool,
} }
static int static int
virStorageBackendDiskMakePoolGeometry(size_t ntok ATTRIBUTE_UNUSED, virStorageBackendDiskMakePoolGeometry(size_t ntok G_GNUC_UNUSED,
char **const groups, char **const groups,
void *data) void *data)
{ {

4
src/storage/storage_backend_fs.c
View File

@ -438,8 +438,8 @@ virStorageBackendExecuteMKFS(const char *device,
} }
#else /* #ifdef MKFS */ #else /* #ifdef MKFS */
static int static int
virStorageBackendExecuteMKFS(const char *device ATTRIBUTE_UNUSED, virStorageBackendExecuteMKFS(const char *device G_GNUC_UNUSED,
const char *format ATTRIBUTE_UNUSED) const char *format G_GNUC_UNUSED)
{ {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("mkfs is not supported on this platform: " _("mkfs is not supported on this platform: "

4
src/storage/storage_backend_logical.c
View File

@ -543,7 +543,7 @@ virStorageBackendLogicalGetPoolSources(virStoragePoolSourceListPtr sourceList)
static char * static char *
virStorageBackendLogicalFindPoolSources(const char *srcSpec ATTRIBUTE_UNUSED, virStorageBackendLogicalFindPoolSources(const char *srcSpec G_GNUC_UNUSED,
unsigned int flags) unsigned int flags)
{ {
virStoragePoolSourceList sourceList; virStoragePoolSourceList sourceList;
@ -837,7 +837,7 @@ virStorageBackendLogicalDeletePool(virStoragePoolObjPtr pool,
static int static int
virStorageBackendLogicalDeleteVol(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageBackendLogicalDeleteVol(virStoragePoolObjPtr pool G_GNUC_UNUSED,
virStorageVolDefPtr vol, virStorageVolDefPtr vol,
unsigned int flags) unsigned int flags)
{ {

2
src/storage/storage_backend_mpath.c
View File

@ -233,7 +233,7 @@ virStorageBackendGetMaps(virStoragePoolObjPtr pool)
} }
static int static int
virStorageBackendMpathCheckPool(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageBackendMpathCheckPool(virStoragePoolObjPtr pool G_GNUC_UNUSED,
bool *isActive) bool *isActive)
{ {
*isActive = virFileExists("/dev/mapper") || *isActive = virFileExists("/dev/mapper") ||

22
src/storage/storage_backend_rbd.c
View File

@ -450,7 +450,7 @@ volStorageBackendRBDUseFastDiff(uint64_t features, uint64_t flags)
} }
static int static int
virStorageBackendRBDRefreshVolInfoCb(uint64_t offset ATTRIBUTE_UNUSED, virStorageBackendRBDRefreshVolInfoCb(uint64_t offset G_GNUC_UNUSED,
size_t len, size_t len,
int exists, int exists,
void *arg) void *arg)
@ -490,8 +490,8 @@ virStorageBackendRBDSetAllocation(virStorageVolDefPtr vol,
#else #else
static int static int
volStorageBackendRBDGetFlags(rbd_image_t image ATTRIBUTE_UNUSED, volStorageBackendRBDGetFlags(rbd_image_t image G_GNUC_UNUSED,
const char *volname ATTRIBUTE_UNUSED, const char *volname G_GNUC_UNUSED,
uint64_t *flags) uint64_t *flags)
{ {
*flags = 0; *flags = 0;
@ -499,16 +499,16 @@ volStorageBackendRBDGetFlags(rbd_image_t image ATTRIBUTE_UNUSED,
} }
static int static int
volStorageBackendRBDUseFastDiff(uint64_t features ATTRIBUTE_UNUSED, volStorageBackendRBDUseFastDiff(uint64_t features G_GNUC_UNUSED,
uint64_t feature_flags ATTRIBUTE_UNUSED) uint64_t feature_flags G_GNUC_UNUSED)
{ {
return false; return false;
} }
static int static int
virStorageBackendRBDSetAllocation(virStorageVolDefPtr vol ATTRIBUTE_UNUSED, virStorageBackendRBDSetAllocation(virStorageVolDefPtr vol G_GNUC_UNUSED,
rbd_image_t *image ATTRIBUTE_UNUSED, rbd_image_t *image G_GNUC_UNUSED,
rbd_image_info_t *info ATTRIBUTE_UNUSED) rbd_image_info_t *info G_GNUC_UNUSED)
{ {
return false; return false;
} }
@ -1013,9 +1013,9 @@ virStorageBackendRBDImageInfo(rbd_image_t image,
/* Callback function for rbd_diff_iterate() */ /* Callback function for rbd_diff_iterate() */
static int static int
virStorageBackendRBDIterateCb(uint64_t offset ATTRIBUTE_UNUSED, virStorageBackendRBDIterateCb(uint64_t offset G_GNUC_UNUSED,
size_t length ATTRIBUTE_UNUSED, size_t length G_GNUC_UNUSED,
int exists ATTRIBUTE_UNUSED, int exists G_GNUC_UNUSED,
void *arg) void *arg)
{ {
/* /*

4
src/storage/storage_backend_zfs.c
View File

@ -81,7 +81,7 @@ virStorageBackendZFSVolModeNeeded(void)
} }
static int static int
virStorageBackendZFSCheckPool(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageBackendZFSCheckPool(virStoragePoolObjPtr pool G_GNUC_UNUSED,
bool *isActive) bool *isActive)
{ {
virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool);
@ -218,7 +218,7 @@ virStorageBackendZFSFindVols(virStoragePoolObjPtr pool,
} }
static int static int
virStorageBackendZFSRefreshPool(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED) virStorageBackendZFSRefreshPool(virStoragePoolObjPtr pool G_GNUC_UNUSED)
{ {
virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool);
char *zpool_props = NULL; char *zpool_props = NULL;

22
src/storage/storage_driver.c
View File

@ -132,7 +132,7 @@ virStoragePoolUpdateInactive(virStoragePoolObjPtr obj)
static void static void
storagePoolUpdateStateCallback(virStoragePoolObjPtr obj, storagePoolUpdateStateCallback(virStoragePoolObjPtr obj,
const void *opaque ATTRIBUTE_UNUSED) const void *opaque G_GNUC_UNUSED)
{ {
virStoragePoolDefPtr def = virStoragePoolObjGetDef(obj); virStoragePoolDefPtr def = virStoragePoolObjGetDef(obj);
bool active = false; bool active = false;
@ -191,7 +191,7 @@ storagePoolUpdateAllState(void)
static void static void
storageDriverAutostartCallback(virStoragePoolObjPtr obj, storageDriverAutostartCallback(virStoragePoolObjPtr obj,
const void *opaque ATTRIBUTE_UNUSED) const void *opaque G_GNUC_UNUSED)
{ {
virStoragePoolDefPtr def = virStoragePoolObjGetDef(obj); virStoragePoolDefPtr def = virStoragePoolObjGetDef(obj);
virStorageBackendPtr backend; virStorageBackendPtr backend;
@ -253,8 +253,8 @@ storageDriverAutostart(void)
*/ */
static int static int
storageStateInitialize(bool privileged, storageStateInitialize(bool privileged,
virStateInhibitCallback callback ATTRIBUTE_UNUSED, virStateInhibitCallback callback G_GNUC_UNUSED,
void *opaque ATTRIBUTE_UNUSED) void *opaque G_GNUC_UNUSED)
{ {
VIR_AUTOFREE(char *) configdir = NULL; VIR_AUTOFREE(char *) configdir = NULL;
VIR_AUTOFREE(char *) rundir = NULL; VIR_AUTOFREE(char *) rundir = NULL;
@ -404,8 +404,8 @@ storageStateCleanup(void)
static virDrvOpenStatus static virDrvOpenStatus
storageConnectOpen(virConnectPtr conn, storageConnectOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED, virConnectAuthPtr auth G_GNUC_UNUSED,
virConfPtr conf ATTRIBUTE_UNUSED, virConfPtr conf G_GNUC_UNUSED,
unsigned int flags) unsigned int flags)
{ {
virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
@ -427,27 +427,27 @@ storageConnectOpen(virConnectPtr conn,
return VIR_DRV_OPEN_SUCCESS; return VIR_DRV_OPEN_SUCCESS;
} }
static int storageConnectClose(virConnectPtr conn ATTRIBUTE_UNUSED) static int storageConnectClose(virConnectPtr conn G_GNUC_UNUSED)
{ {
return 0; return 0;
} }
static int storageConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) static int storageConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED)
{ {
/* Trivially secure, since always inside the daemon */ /* Trivially secure, since always inside the daemon */
return 1; return 1;
} }
static int storageConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) static int storageConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED)
{ {
/* Not encrypted, but remote driver takes care of that */ /* Not encrypted, but remote driver takes care of that */
return 0; return 0;
} }
static int storageConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) static int storageConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED)
{ {
return 1; return 1;
} }
@ -2377,7 +2377,7 @@ virStorageVolPoolRefreshThread(void *opaque)
* @opaque Buffer to hold the pool name to be refreshed * @opaque Buffer to hold the pool name to be refreshed
*/ */
static void static void
virStorageVolFDStreamCloseCb(virStreamPtr st ATTRIBUTE_UNUSED, virStorageVolFDStreamCloseCb(virStreamPtr st G_GNUC_UNUSED,
void *opaque) void *opaque)
{ {
virThread thread; virThread thread;

36
src/storage/storage_util.c
View File

@ -113,8 +113,8 @@ reflinkCloneFile(int dest_fd, int src_fd)
} }
#else #else
static inline int static inline int
reflinkCloneFile(int dest_fd ATTRIBUTE_UNUSED, reflinkCloneFile(int dest_fd G_GNUC_UNUSED,
int src_fd ATTRIBUTE_UNUSED) int src_fd G_GNUC_UNUSED)
{ {
errno = ENOTSUP; errno = ENOTSUP;
return -1; return -1;
@ -236,7 +236,7 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol,
} }
static int static int
storageBackendCreateBlockFrom(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, storageBackendCreateBlockFrom(virStoragePoolObjPtr pool G_GNUC_UNUSED,
virStorageVolDefPtr vol, virStorageVolDefPtr vol,
virStorageVolDefPtr inputvol, virStorageVolDefPtr inputvol,
unsigned int flags) unsigned int flags)
@ -591,7 +591,7 @@ virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool,
/* Create ploop directory with ploop image and DiskDescriptor.xml /* Create ploop directory with ploop image and DiskDescriptor.xml
* if function fails to create image file the directory will be deleted.*/ * if function fails to create image file the directory will be deleted.*/
static int static int
storageBackendCreatePloop(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, storageBackendCreatePloop(virStoragePoolObjPtr pool G_GNUC_UNUSED,
virStorageVolDefPtr vol, virStorageVolDefPtr vol,
virStorageVolDefPtr inputvol, virStorageVolDefPtr inputvol,
unsigned int flags) unsigned int flags)
@ -2136,7 +2136,7 @@ virStorageBackendVolBuildFromLocal(virStoragePoolObjPtr pool,
* Remove a volume - no support for BLOCK and NETWORK yet * Remove a volume - no support for BLOCK and NETWORK yet
*/ */
int int
virStorageBackendVolDeleteLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageBackendVolDeleteLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED,
virStorageVolDefPtr vol, virStorageVolDefPtr vol,
unsigned int flags) unsigned int flags)
{ {
@ -2237,7 +2237,7 @@ storageBackendLoadDefaultSecrets(virStorageVolDefPtr vol)
* Update info about a volume's capacity/allocation * Update info about a volume's capacity/allocation
*/ */
int int
virStorageBackendVolRefreshLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageBackendVolRefreshLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED,
virStorageVolDefPtr vol) virStorageVolDefPtr vol)
{ {
int ret; int ret;
@ -2407,7 +2407,7 @@ storageBackendPloopHasSnapshots(char *path)
int int
virStorageBackendVolUploadLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageBackendVolUploadLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED,
virStorageVolDefPtr vol, virStorageVolDefPtr vol,
virStreamPtr stream, virStreamPtr stream,
unsigned long long offset, unsigned long long offset,
@ -2448,7 +2448,7 @@ virStorageBackendVolUploadLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED,
} }
int int
virStorageBackendVolDownloadLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageBackendVolDownloadLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED,
virStorageVolDefPtr vol, virStorageVolDefPtr vol,
virStreamPtr stream, virStreamPtr stream,
unsigned long long offset, unsigned long long offset,
@ -2716,7 +2716,7 @@ storageBackendVolWipePloop(virStorageVolDefPtr vol,
int int
virStorageBackendVolWipeLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageBackendVolWipeLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED,
virStorageVolDefPtr vol, virStorageVolDefPtr vol,
unsigned int algorithm, unsigned int algorithm,
unsigned int flags) unsigned int flags)
@ -3145,9 +3145,9 @@ virStorageBackendBLKIDFindEmpty(const char *device,
#else /* #if WITH_BLKID */ #else /* #if WITH_BLKID */
static int static int
virStorageBackendBLKIDFindEmpty(const char *device ATTRIBUTE_UNUSED, virStorageBackendBLKIDFindEmpty(const char *device G_GNUC_UNUSED,
const char *format ATTRIBUTE_UNUSED, const char *format G_GNUC_UNUSED,
bool writelabel ATTRIBUTE_UNUSED) bool writelabel G_GNUC_UNUSED)
{ {
return -2; return -2;
} }
@ -3303,9 +3303,9 @@ virStorageBackendPARTEDValidLabel(const char *device,
#else #else
static int static int
virStorageBackendPARTEDValidLabel(const char *device ATTRIBUTE_UNUSED, virStorageBackendPARTEDValidLabel(const char *device G_GNUC_UNUSED,
const char *format ATTRIBUTE_UNUSED, const char *format G_GNUC_UNUSED,
bool writelabel ATTRIBUTE_UNUSED) bool writelabel G_GNUC_UNUSED)
{ {
return -2; return -2;
} }
@ -3658,7 +3658,7 @@ virStorageBackendSCSISerial(const char *dev,
*/ */
static int static int
virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, virStorageBackendSCSINewLun(virStoragePoolObjPtr pool,
uint32_t host ATTRIBUTE_UNUSED, uint32_t host G_GNUC_UNUSED,
uint32_t bus, uint32_t bus,
uint32_t target, uint32_t target,
uint32_t lun, uint32_t lun,
@ -3750,7 +3750,7 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool,
static int static int
getNewStyleBlockDevice(const char *lun_path, getNewStyleBlockDevice(const char *lun_path,
const char *block_name ATTRIBUTE_UNUSED, const char *block_name G_GNUC_UNUSED,
char **block_device) char **block_device)
{ {
DIR *block_dir = NULL; DIR *block_dir = NULL;
@ -3788,7 +3788,7 @@ getNewStyleBlockDevice(const char *lun_path,
static int static int
getOldStyleBlockDevice(const char *lun_path ATTRIBUTE_UNUSED, getOldStyleBlockDevice(const char *lun_path G_GNUC_UNUSED,
const char *block_name, const char *block_name,
char **block_device) char **block_device)
{ {