Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED.
Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
---
src/util/viraudit.c | 8 +-
src/util/vircgroup.c | 398 +++++++++++++++----------------
src/util/vircgroupv1.c | 2 +-
src/util/vircgroupv2.c | 14 +-
src/util/vircommand.c | 48 ++--
src/util/virdbus.c | 76 +++---
src/util/virdevmapper.c | 14 +-
src/util/virdnsmasq.c | 2 +-
src/util/vireventpoll.c | 6 +-
src/util/virfcp.c | 8 +-
src/util/virfdstream.c | 10 +-
src/util/virfile.c | 150 ++++++------
src/util/virhash.c | 8 +-
src/util/virhostcpu.c | 26 +-
src/util/virhostmem.c | 16 +-
src/util/virinitctl.c | 4 +-
src/util/virjson.c | 10 +-
src/util/virkeyfile.c | 2 +-
src/util/virlockspace.c | 6 +-
src/util/virlog.c | 38 +--
src/util/virlog.h | 4 +-
src/util/virmacmap.c | 4 +-
src/util/virmdev.c | 4 +-
src/util/virmodule.c | 2 +-
src/util/virnetdev.c | 134 +++++------
src/util/virnetdevbridge.c | 58 ++---
src/util/virnetdevip.c | 12 +-
src/util/virnetdevmacvlan.c | 100 ++++----
src/util/virnetdevopenvswitch.c | 2 +-
src/util/virnetdevtap.c | 30 +--
src/util/virnetdevvportprofile.c | 28 +--
src/util/virnetlink.c | 92 +++----
src/util/virnodesuspend.c | 4 +-
src/util/virnuma.c | 42 ++--
src/util/virobject.c | 2 +-
src/util/virpci.c | 50 ++--
src/util/virperf.c | 20 +-
src/util/virpidfile.c | 2 +-
src/util/virpolkit.c | 14 +-
src/util/virprocess.c | 38 +--
src/util/virscsihost.c | 24 +-
src/util/virsocketaddr.c | 2 +-
src/util/virstoragefile.c | 26 +-
src/util/virstring.c | 6 +-
src/util/virutil.c | 54 ++---
src/util/virvhba.c | 34 +--
src/util/virvsock.c | 4 +-
src/util/virxml.c | 6 +-
48 files changed, 822 insertions(+), 822 deletions(-)
diff --git a/src/util/viraudit.c b/src/util/viraudit.c
index a02e5b36fd..23bc44734e 100644
--- a/src/util/viraudit.c
+++ b/src/util/viraudit.c
@@ -54,7 +54,7 @@ static int auditfd = -1;
#endif
static bool auditlog;
-int virAuditOpen(unsigned int audit_level ATTRIBUTE_UNUSED)
+int virAuditOpen(unsigned int audit_level G_GNUC_UNUSED)
{
#if WITH_AUDIT
if ((auditfd = audit_open()) < 0) {
@@ -91,9 +91,9 @@ void virAuditSend(virLogSourcePtr source,
const char *filename,
size_t linenr,
const char *funcname,
- const char *clienttty ATTRIBUTE_UNUSED,
- const char *clientaddr ATTRIBUTE_UNUSED,
- virAuditRecordType type ATTRIBUTE_UNUSED, bool success,
+ const char *clienttty G_GNUC_UNUSED,
+ const char *clientaddr G_GNUC_UNUSED,
+ virAuditRecordType type G_GNUC_UNUSED, bool success,
const char *fmt, ...)
{
VIR_AUTOFREE(char *) str = NULL;
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 70d41c4ba5..c6e4cf2dde 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -2802,10 +2802,10 @@ virCgroupAvailable(void)
int
-virCgroupNewPartition(const char *path ATTRIBUTE_UNUSED,
- bool create ATTRIBUTE_UNUSED,
- int controllers ATTRIBUTE_UNUSED,
- virCgroupPtr *group ATTRIBUTE_UNUSED)
+virCgroupNewPartition(const char *path G_GNUC_UNUSED,
+ bool create G_GNUC_UNUSED,
+ int controllers G_GNUC_UNUSED,
+ virCgroupPtr *group G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Control groups not supported on this platform"));
@@ -2814,7 +2814,7 @@ virCgroupNewPartition(const char *path ATTRIBUTE_UNUSED,
int
-virCgroupNewSelf(virCgroupPtr *group ATTRIBUTE_UNUSED)
+virCgroupNewSelf(virCgroupPtr *group G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Control groups not supported on this platform"));
@@ -2823,11 +2823,11 @@ virCgroupNewSelf(virCgroupPtr *group ATTRIBUTE_UNUSED)
int
-virCgroupNewDomainPartition(virCgroupPtr partition ATTRIBUTE_UNUSED,
- const char *driver ATTRIBUTE_UNUSED,
- const char *name ATTRIBUTE_UNUSED,
- bool create ATTRIBUTE_UNUSED,
- virCgroupPtr *group ATTRIBUTE_UNUSED)
+virCgroupNewDomainPartition(virCgroupPtr partition G_GNUC_UNUSED,
+ const char *driver G_GNUC_UNUSED,
+ const char *name G_GNUC_UNUSED,
+ bool create G_GNUC_UNUSED,
+ virCgroupPtr *group G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Control groups not supported on this platform"));
@@ -2836,11 +2836,11 @@ virCgroupNewDomainPartition(virCgroupPtr partition ATTRIBUTE_UNUSED,
int
-virCgroupNewThread(virCgroupPtr domain ATTRIBUTE_UNUSED,
- virCgroupThreadName nameval ATTRIBUTE_UNUSED,
- int id ATTRIBUTE_UNUSED,
- bool create ATTRIBUTE_UNUSED,
- virCgroupPtr *group ATTRIBUTE_UNUSED)
+virCgroupNewThread(virCgroupPtr domain G_GNUC_UNUSED,
+ virCgroupThreadName nameval G_GNUC_UNUSED,
+ int id G_GNUC_UNUSED,
+ bool create G_GNUC_UNUSED,
+ virCgroupPtr *group G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Control groups not supported on this platform"));
@@ -2849,9 +2849,9 @@ virCgroupNewThread(virCgroupPtr domain ATTRIBUTE_UNUSED,
int
-virCgroupNewDetect(pid_t pid ATTRIBUTE_UNUSED,
- int controllers ATTRIBUTE_UNUSED,
- virCgroupPtr *group ATTRIBUTE_UNUSED)
+virCgroupNewDetect(pid_t pid G_GNUC_UNUSED,
+ int controllers G_GNUC_UNUSED,
+ virCgroupPtr *group G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Control groups not supported on this platform"));
@@ -2860,12 +2860,12 @@ virCgroupNewDetect(pid_t pid ATTRIBUTE_UNUSED,
int
-virCgroupNewDetectMachine(const char *name ATTRIBUTE_UNUSED,
- const char *drivername ATTRIBUTE_UNUSED,
- pid_t pid ATTRIBUTE_UNUSED,
- int controllers ATTRIBUTE_UNUSED,
- char *machinename ATTRIBUTE_UNUSED,
- virCgroupPtr *group ATTRIBUTE_UNUSED)
+virCgroupNewDetectMachine(const char *name G_GNUC_UNUSED,
+ const char *drivername G_GNUC_UNUSED,
+ pid_t pid G_GNUC_UNUSED,
+ int controllers G_GNUC_UNUSED,
+ char *machinename G_GNUC_UNUSED,
+ virCgroupPtr *group G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Control groups not supported on this platform"));
@@ -2873,7 +2873,7 @@ virCgroupNewDetectMachine(const char *name ATTRIBUTE_UNUSED,
}
-int virCgroupTerminateMachine(const char *name ATTRIBUTE_UNUSED)
+int virCgroupTerminateMachine(const char *name G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Control groups not supported on this platform"));
@@ -2882,18 +2882,18 @@ int virCgroupTerminateMachine(const char *name ATTRIBUTE_UNUSED)
int
-virCgroupNewMachine(const char *name ATTRIBUTE_UNUSED,
- const char *drivername ATTRIBUTE_UNUSED,
- const unsigned char *uuid ATTRIBUTE_UNUSED,
- const char *rootdir ATTRIBUTE_UNUSED,
- pid_t pidleader ATTRIBUTE_UNUSED,
- bool isContainer ATTRIBUTE_UNUSED,
- size_t nnicindexes ATTRIBUTE_UNUSED,
- int *nicindexes ATTRIBUTE_UNUSED,
- const char *partition ATTRIBUTE_UNUSED,
- int controllers ATTRIBUTE_UNUSED,
- unsigned int maxthreads ATTRIBUTE_UNUSED,
- virCgroupPtr *group ATTRIBUTE_UNUSED)
+virCgroupNewMachine(const char *name G_GNUC_UNUSED,
+ const char *drivername G_GNUC_UNUSED,
+ const unsigned char *uuid G_GNUC_UNUSED,
+ const char *rootdir G_GNUC_UNUSED,
+ pid_t pidleader G_GNUC_UNUSED,
+ bool isContainer G_GNUC_UNUSED,
+ size_t nnicindexes G_GNUC_UNUSED,
+ int *nicindexes G_GNUC_UNUSED,
+ const char *partition G_GNUC_UNUSED,
+ int controllers G_GNUC_UNUSED,
+ unsigned int maxthreads G_GNUC_UNUSED,
+ virCgroupPtr *group G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Control groups not supported on this platform"));
@@ -2910,18 +2910,18 @@ virCgroupNewIgnoreError(void)
bool
-virCgroupHasController(virCgroupPtr cgroup ATTRIBUTE_UNUSED,
- int controller ATTRIBUTE_UNUSED)
+virCgroupHasController(virCgroupPtr cgroup G_GNUC_UNUSED,
+ int controller G_GNUC_UNUSED)
{
return false;
}
int
-virCgroupPathOfController(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned int controller ATTRIBUTE_UNUSED,
- const char *key ATTRIBUTE_UNUSED,
- char **path ATTRIBUTE_UNUSED)
+virCgroupPathOfController(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned int controller G_GNUC_UNUSED,
+ const char *key G_GNUC_UNUSED,
+ char **path G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Control groups not supported on this platform"));
@@ -2930,8 +2930,8 @@ virCgroupPathOfController(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupAddProcess(virCgroupPtr group ATTRIBUTE_UNUSED,
- pid_t pid ATTRIBUTE_UNUSED)
+virCgroupAddProcess(virCgroupPtr group G_GNUC_UNUSED,
+ pid_t pid G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Control groups not supported on this platform"));
@@ -2940,8 +2940,8 @@ virCgroupAddProcess(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupAddMachineProcess(virCgroupPtr group ATTRIBUTE_UNUSED,
- pid_t pid ATTRIBUTE_UNUSED)
+virCgroupAddMachineProcess(virCgroupPtr group G_GNUC_UNUSED,
+ pid_t pid G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Control groups not supported on this platform"));
@@ -2950,8 +2950,8 @@ virCgroupAddMachineProcess(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupAddThread(virCgroupPtr group ATTRIBUTE_UNUSED,
- pid_t pid ATTRIBUTE_UNUSED)
+virCgroupAddThread(virCgroupPtr group G_GNUC_UNUSED,
+ pid_t pid G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Control groups not supported on this platform"));
@@ -2960,11 +2960,11 @@ virCgroupAddThread(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetBlkioIoServiced(virCgroupPtr group ATTRIBUTE_UNUSED,
- long long *bytes_read ATTRIBUTE_UNUSED,
- long long *bytes_write ATTRIBUTE_UNUSED,
- long long *requests_read ATTRIBUTE_UNUSED,
- long long *requests_write ATTRIBUTE_UNUSED)
+virCgroupGetBlkioIoServiced(virCgroupPtr group G_GNUC_UNUSED,
+ long long *bytes_read G_GNUC_UNUSED,
+ long long *bytes_write G_GNUC_UNUSED,
+ long long *requests_read G_GNUC_UNUSED,
+ long long *requests_write G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Control groups not supported on this platform"));
@@ -2973,12 +2973,12 @@ virCgroupGetBlkioIoServiced(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetBlkioIoDeviceServiced(virCgroupPtr group ATTRIBUTE_UNUSED,
- const char *path ATTRIBUTE_UNUSED,
- long long *bytes_read ATTRIBUTE_UNUSED,
- long long *bytes_write ATTRIBUTE_UNUSED,
- long long *requests_read ATTRIBUTE_UNUSED,
- long long *requests_write ATTRIBUTE_UNUSED)
+virCgroupGetBlkioIoDeviceServiced(virCgroupPtr group G_GNUC_UNUSED,
+ const char *path G_GNUC_UNUSED,
+ long long *bytes_read G_GNUC_UNUSED,
+ long long *bytes_write G_GNUC_UNUSED,
+ long long *requests_read G_GNUC_UNUSED,
+ long long *requests_write G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Control groups not supported on this platform"));
@@ -2987,8 +2987,8 @@ virCgroupGetBlkioIoDeviceServiced(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupSetBlkioWeight(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned int weight ATTRIBUTE_UNUSED)
+virCgroupSetBlkioWeight(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned int weight G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Control groups not supported on this platform"));
@@ -2997,8 +2997,8 @@ virCgroupSetBlkioWeight(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetBlkioWeight(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned int *weight ATTRIBUTE_UNUSED)
+virCgroupGetBlkioWeight(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned int *weight G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Control groups not supported on this platform"));
@@ -3007,9 +3007,9 @@ virCgroupGetBlkioWeight(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupSetBlkioDeviceWeight(virCgroupPtr group ATTRIBUTE_UNUSED,
- const char *path ATTRIBUTE_UNUSED,
- unsigned int weight ATTRIBUTE_UNUSED)
+virCgroupSetBlkioDeviceWeight(virCgroupPtr group G_GNUC_UNUSED,
+ const char *path G_GNUC_UNUSED,
+ unsigned int weight G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3017,9 +3017,9 @@ virCgroupSetBlkioDeviceWeight(virCgroupPtr group ATTRIBUTE_UNUSED,
}
int
-virCgroupSetBlkioDeviceReadIops(virCgroupPtr group ATTRIBUTE_UNUSED,
- const char *path ATTRIBUTE_UNUSED,
- unsigned int riops ATTRIBUTE_UNUSED)
+virCgroupSetBlkioDeviceReadIops(virCgroupPtr group G_GNUC_UNUSED,
+ const char *path G_GNUC_UNUSED,
+ unsigned int riops G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3027,9 +3027,9 @@ virCgroupSetBlkioDeviceReadIops(virCgroupPtr group ATTRIBUTE_UNUSED,
}
int
-virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group ATTRIBUTE_UNUSED,
- const char *path ATTRIBUTE_UNUSED,
- unsigned int wiops ATTRIBUTE_UNUSED)
+virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group G_GNUC_UNUSED,
+ const char *path G_GNUC_UNUSED,
+ unsigned int wiops G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3037,9 +3037,9 @@ virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group ATTRIBUTE_UNUSED,
}
int
-virCgroupSetBlkioDeviceReadBps(virCgroupPtr group ATTRIBUTE_UNUSED,
- const char *path ATTRIBUTE_UNUSED,
- unsigned long long rbps ATTRIBUTE_UNUSED)
+virCgroupSetBlkioDeviceReadBps(virCgroupPtr group G_GNUC_UNUSED,
+ const char *path G_GNUC_UNUSED,
+ unsigned long long rbps G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3047,9 +3047,9 @@ virCgroupSetBlkioDeviceReadBps(virCgroupPtr group ATTRIBUTE_UNUSED,
}
int
-virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group ATTRIBUTE_UNUSED,
- const char *path ATTRIBUTE_UNUSED,
- unsigned long long wbps ATTRIBUTE_UNUSED)
+virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group G_GNUC_UNUSED,
+ const char *path G_GNUC_UNUSED,
+ unsigned long long wbps G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3057,9 +3057,9 @@ virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group ATTRIBUTE_UNUSED,
}
int
-virCgroupGetBlkioDeviceWeight(virCgroupPtr group ATTRIBUTE_UNUSED,
- const char *path ATTRIBUTE_UNUSED,
- unsigned int *weight ATTRIBUTE_UNUSED)
+virCgroupGetBlkioDeviceWeight(virCgroupPtr group G_GNUC_UNUSED,
+ const char *path G_GNUC_UNUSED,
+ unsigned int *weight G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3067,9 +3067,9 @@ virCgroupGetBlkioDeviceWeight(virCgroupPtr group ATTRIBUTE_UNUSED,
}
int
-virCgroupGetBlkioDeviceReadIops(virCgroupPtr group ATTRIBUTE_UNUSED,
- const char *path ATTRIBUTE_UNUSED,
- unsigned int *riops ATTRIBUTE_UNUSED)
+virCgroupGetBlkioDeviceReadIops(virCgroupPtr group G_GNUC_UNUSED,
+ const char *path G_GNUC_UNUSED,
+ unsigned int *riops G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3077,9 +3077,9 @@ virCgroupGetBlkioDeviceReadIops(virCgroupPtr group ATTRIBUTE_UNUSED,
}
int
-virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group ATTRIBUTE_UNUSED,
- const char *path ATTRIBUTE_UNUSED,
- unsigned int *wiops ATTRIBUTE_UNUSED)
+virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group G_GNUC_UNUSED,
+ const char *path G_GNUC_UNUSED,
+ unsigned int *wiops G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3087,9 +3087,9 @@ virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group ATTRIBUTE_UNUSED,
}
int
-virCgroupGetBlkioDeviceReadBps(virCgroupPtr group ATTRIBUTE_UNUSED,
- const char *path ATTRIBUTE_UNUSED,
- unsigned long long *rbps ATTRIBUTE_UNUSED)
+virCgroupGetBlkioDeviceReadBps(virCgroupPtr group G_GNUC_UNUSED,
+ const char *path G_GNUC_UNUSED,
+ unsigned long long *rbps G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3097,9 +3097,9 @@ virCgroupGetBlkioDeviceReadBps(virCgroupPtr group ATTRIBUTE_UNUSED,
}
int
-virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group ATTRIBUTE_UNUSED,
- const char *path ATTRIBUTE_UNUSED,
- unsigned long long *wbps ATTRIBUTE_UNUSED)
+virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group G_GNUC_UNUSED,
+ const char *path G_GNUC_UNUSED,
+ unsigned long long *wbps G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3107,8 +3107,8 @@ virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group ATTRIBUTE_UNUSED,
}
int
-virCgroupSetMemory(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned long long kb ATTRIBUTE_UNUSED)
+virCgroupSetMemory(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned long long kb G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3117,13 +3117,13 @@ virCgroupSetMemory(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetMemoryStat(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned long long *cache ATTRIBUTE_UNUSED,
- unsigned long long *activeAnon ATTRIBUTE_UNUSED,
- unsigned long long *inactiveAnon ATTRIBUTE_UNUSED,
- unsigned long long *activeFile ATTRIBUTE_UNUSED,
- unsigned long long *inactiveFile ATTRIBUTE_UNUSED,
- unsigned long long *unevictable ATTRIBUTE_UNUSED)
+virCgroupGetMemoryStat(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned long long *cache G_GNUC_UNUSED,
+ unsigned long long *activeAnon G_GNUC_UNUSED,
+ unsigned long long *inactiveAnon G_GNUC_UNUSED,
+ unsigned long long *activeFile G_GNUC_UNUSED,
+ unsigned long long *inactiveFile G_GNUC_UNUSED,
+ unsigned long long *unevictable G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3132,8 +3132,8 @@ virCgroupGetMemoryStat(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetMemoryUsage(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned long *kb ATTRIBUTE_UNUSED)
+virCgroupGetMemoryUsage(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned long *kb G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3142,8 +3142,8 @@ virCgroupGetMemoryUsage(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupSetMemoryHardLimit(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned long long kb ATTRIBUTE_UNUSED)
+virCgroupSetMemoryHardLimit(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned long long kb G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3152,8 +3152,8 @@ virCgroupSetMemoryHardLimit(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetMemoryHardLimit(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned long long *kb ATTRIBUTE_UNUSED)
+virCgroupGetMemoryHardLimit(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned long long *kb G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3162,8 +3162,8 @@ virCgroupGetMemoryHardLimit(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupSetMemorySoftLimit(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned long long kb ATTRIBUTE_UNUSED)
+virCgroupSetMemorySoftLimit(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned long long kb G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3172,8 +3172,8 @@ virCgroupSetMemorySoftLimit(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetMemorySoftLimit(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned long long *kb ATTRIBUTE_UNUSED)
+virCgroupGetMemorySoftLimit(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned long long *kb G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3182,8 +3182,8 @@ virCgroupGetMemorySoftLimit(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupSetMemSwapHardLimit(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned long long kb ATTRIBUTE_UNUSED)
+virCgroupSetMemSwapHardLimit(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned long long kb G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3192,8 +3192,8 @@ virCgroupSetMemSwapHardLimit(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetMemSwapHardLimit(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned long long *kb ATTRIBUTE_UNUSED)
+virCgroupGetMemSwapHardLimit(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned long long *kb G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3202,8 +3202,8 @@ virCgroupGetMemSwapHardLimit(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetMemSwapUsage(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned long long *kb ATTRIBUTE_UNUSED)
+virCgroupGetMemSwapUsage(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned long long *kb G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3212,8 +3212,8 @@ virCgroupGetMemSwapUsage(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupSetCpusetMems(virCgroupPtr group ATTRIBUTE_UNUSED,
- const char *mems ATTRIBUTE_UNUSED)
+virCgroupSetCpusetMems(virCgroupPtr group G_GNUC_UNUSED,
+ const char *mems G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3222,8 +3222,8 @@ virCgroupSetCpusetMems(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetCpusetMems(virCgroupPtr group ATTRIBUTE_UNUSED,
- char **mems ATTRIBUTE_UNUSED)
+virCgroupGetCpusetMems(virCgroupPtr group G_GNUC_UNUSED,
+ char **mems G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3232,8 +3232,8 @@ virCgroupGetCpusetMems(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupSetCpusetMemoryMigrate(virCgroupPtr group ATTRIBUTE_UNUSED,
- bool migrate ATTRIBUTE_UNUSED)
+virCgroupSetCpusetMemoryMigrate(virCgroupPtr group G_GNUC_UNUSED,
+ bool migrate G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3242,8 +3242,8 @@ virCgroupSetCpusetMemoryMigrate(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetCpusetMemoryMigrate(virCgroupPtr group ATTRIBUTE_UNUSED,
- bool *migrate ATTRIBUTE_UNUSED)
+virCgroupGetCpusetMemoryMigrate(virCgroupPtr group G_GNUC_UNUSED,
+ bool *migrate G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3252,8 +3252,8 @@ virCgroupGetCpusetMemoryMigrate(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupSetCpusetCpus(virCgroupPtr group ATTRIBUTE_UNUSED,
- const char *cpus ATTRIBUTE_UNUSED)
+virCgroupSetCpusetCpus(virCgroupPtr group G_GNUC_UNUSED,
+ const char *cpus G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3262,8 +3262,8 @@ virCgroupSetCpusetCpus(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetCpusetCpus(virCgroupPtr group ATTRIBUTE_UNUSED,
- char **cpus ATTRIBUTE_UNUSED)
+virCgroupGetCpusetCpus(virCgroupPtr group G_GNUC_UNUSED,
+ char **cpus G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3271,8 +3271,8 @@ virCgroupGetCpusetCpus(virCgroupPtr group ATTRIBUTE_UNUSED,
}
int
-virCgroupAllowAllDevices(virCgroupPtr group ATTRIBUTE_UNUSED,
- int perms ATTRIBUTE_UNUSED)
+virCgroupAllowAllDevices(virCgroupPtr group G_GNUC_UNUSED,
+ int perms G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3280,7 +3280,7 @@ virCgroupAllowAllDevices(virCgroupPtr group ATTRIBUTE_UNUSED,
}
int
-virCgroupDenyAllDevices(virCgroupPtr group ATTRIBUTE_UNUSED)
+virCgroupDenyAllDevices(virCgroupPtr group G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3289,11 +3289,11 @@ virCgroupDenyAllDevices(virCgroupPtr group ATTRIBUTE_UNUSED)
int
-virCgroupAllowDevice(virCgroupPtr group ATTRIBUTE_UNUSED,
- char type ATTRIBUTE_UNUSED,
- int major ATTRIBUTE_UNUSED,
- int minor ATTRIBUTE_UNUSED,
- int perms ATTRIBUTE_UNUSED)
+virCgroupAllowDevice(virCgroupPtr group G_GNUC_UNUSED,
+ char type G_GNUC_UNUSED,
+ int major G_GNUC_UNUSED,
+ int minor G_GNUC_UNUSED,
+ int perms G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3302,10 +3302,10 @@ virCgroupAllowDevice(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupAllowDevicePath(virCgroupPtr group ATTRIBUTE_UNUSED,
- const char *path ATTRIBUTE_UNUSED,
- int perms ATTRIBUTE_UNUSED,
- bool ignoreEaccess ATTRIBUTE_UNUSED)
+virCgroupAllowDevicePath(virCgroupPtr group G_GNUC_UNUSED,
+ const char *path G_GNUC_UNUSED,
+ int perms G_GNUC_UNUSED,
+ bool ignoreEaccess G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3314,11 +3314,11 @@ virCgroupAllowDevicePath(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupDenyDevice(virCgroupPtr group ATTRIBUTE_UNUSED,
- char type ATTRIBUTE_UNUSED,
- int major ATTRIBUTE_UNUSED,
- int minor ATTRIBUTE_UNUSED,
- int perms ATTRIBUTE_UNUSED)
+virCgroupDenyDevice(virCgroupPtr group G_GNUC_UNUSED,
+ char type G_GNUC_UNUSED,
+ int major G_GNUC_UNUSED,
+ int minor G_GNUC_UNUSED,
+ int perms G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3327,10 +3327,10 @@ virCgroupDenyDevice(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupDenyDevicePath(virCgroupPtr group ATTRIBUTE_UNUSED,
- const char *path ATTRIBUTE_UNUSED,
- int perms ATTRIBUTE_UNUSED,
- bool ignoreEacces ATTRIBUTE_UNUSED)
+virCgroupDenyDevicePath(virCgroupPtr group G_GNUC_UNUSED,
+ const char *path G_GNUC_UNUSED,
+ int perms G_GNUC_UNUSED,
+ bool ignoreEacces G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3339,8 +3339,8 @@ virCgroupDenyDevicePath(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupSetCpuShares(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned long long shares ATTRIBUTE_UNUSED)
+virCgroupSetCpuShares(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned long long shares G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3349,8 +3349,8 @@ virCgroupSetCpuShares(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetCpuShares(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned long long *shares ATTRIBUTE_UNUSED)
+virCgroupGetCpuShares(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned long long *shares G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3359,8 +3359,8 @@ virCgroupGetCpuShares(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupSetCpuCfsPeriod(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned long long cfs_period ATTRIBUTE_UNUSED)
+virCgroupSetCpuCfsPeriod(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned long long cfs_period G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3369,8 +3369,8 @@ virCgroupSetCpuCfsPeriod(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetCpuCfsPeriod(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned long long *cfs_period ATTRIBUTE_UNUSED)
+virCgroupGetCpuCfsPeriod(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned long long *cfs_period G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3379,8 +3379,8 @@ virCgroupGetCpuCfsPeriod(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupSetCpuCfsQuota(virCgroupPtr group ATTRIBUTE_UNUSED,
- long long cfs_quota ATTRIBUTE_UNUSED)
+virCgroupSetCpuCfsQuota(virCgroupPtr group G_GNUC_UNUSED,
+ long long cfs_quota G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3389,7 +3389,7 @@ virCgroupSetCpuCfsQuota(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupRemove(virCgroupPtr group ATTRIBUTE_UNUSED)
+virCgroupRemove(virCgroupPtr group G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Control groups not supported on this platform"));
@@ -3398,8 +3398,8 @@ virCgroupRemove(virCgroupPtr group ATTRIBUTE_UNUSED)
int
-virCgroupKillRecursive(virCgroupPtr group ATTRIBUTE_UNUSED,
- int signum ATTRIBUTE_UNUSED)
+virCgroupKillRecursive(virCgroupPtr group G_GNUC_UNUSED,
+ int signum G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3408,7 +3408,7 @@ virCgroupKillRecursive(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupKillPainfully(virCgroupPtr group ATTRIBUTE_UNUSED)
+virCgroupKillPainfully(virCgroupPtr group G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3417,8 +3417,8 @@ virCgroupKillPainfully(virCgroupPtr group ATTRIBUTE_UNUSED)
int
-virCgroupGetCpuCfsQuota(virCgroupPtr group ATTRIBUTE_UNUSED,
- long long *cfs_quota ATTRIBUTE_UNUSED)
+virCgroupGetCpuCfsQuota(virCgroupPtr group G_GNUC_UNUSED,
+ long long *cfs_quota G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3427,8 +3427,8 @@ virCgroupGetCpuCfsQuota(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetCpuacctUsage(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned long long *usage ATTRIBUTE_UNUSED)
+virCgroupGetCpuacctUsage(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned long long *usage G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3437,8 +3437,8 @@ virCgroupGetCpuacctUsage(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetCpuacctPercpuUsage(virCgroupPtr group ATTRIBUTE_UNUSED,
- char **usage ATTRIBUTE_UNUSED)
+virCgroupGetCpuacctPercpuUsage(virCgroupPtr group G_GNUC_UNUSED,
+ char **usage G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3447,9 +3447,9 @@ virCgroupGetCpuacctPercpuUsage(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetCpuacctStat(virCgroupPtr group ATTRIBUTE_UNUSED,
- unsigned long long *user ATTRIBUTE_UNUSED,
- unsigned long long *sys ATTRIBUTE_UNUSED)
+virCgroupGetCpuacctStat(virCgroupPtr group G_GNUC_UNUSED,
+ unsigned long long *user G_GNUC_UNUSED,
+ unsigned long long *sys G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3458,9 +3458,9 @@ virCgroupGetCpuacctStat(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetDomainTotalCpuStats(virCgroupPtr group ATTRIBUTE_UNUSED,
- virTypedParameterPtr params ATTRIBUTE_UNUSED,
- int nparams ATTRIBUTE_UNUSED)
+virCgroupGetDomainTotalCpuStats(virCgroupPtr group G_GNUC_UNUSED,
+ virTypedParameterPtr params G_GNUC_UNUSED,
+ int nparams G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3469,8 +3469,8 @@ virCgroupGetDomainTotalCpuStats(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupSetFreezerState(virCgroupPtr group ATTRIBUTE_UNUSED,
- const char *state ATTRIBUTE_UNUSED)
+virCgroupSetFreezerState(virCgroupPtr group G_GNUC_UNUSED,
+ const char *state G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3479,8 +3479,8 @@ virCgroupSetFreezerState(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupGetFreezerState(virCgroupPtr group ATTRIBUTE_UNUSED,
- char **state ATTRIBUTE_UNUSED)
+virCgroupGetFreezerState(virCgroupPtr group G_GNUC_UNUSED,
+ char **state G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3489,9 +3489,9 @@ virCgroupGetFreezerState(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupBindMount(virCgroupPtr group ATTRIBUTE_UNUSED,
- const char *oldroot ATTRIBUTE_UNUSED,
- const char *mountopts ATTRIBUTE_UNUSED)
+virCgroupBindMount(virCgroupPtr group G_GNUC_UNUSED,
+ const char *oldroot G_GNUC_UNUSED,
+ const char *mountopts G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3500,7 +3500,7 @@ virCgroupBindMount(virCgroupPtr group ATTRIBUTE_UNUSED,
bool
-virCgroupSupportsCpuBW(virCgroupPtr cgroup ATTRIBUTE_UNUSED)
+virCgroupSupportsCpuBW(virCgroupPtr cgroup G_GNUC_UNUSED)
{
VIR_DEBUG("Control groups not supported on this platform");
return false;
@@ -3508,12 +3508,12 @@ virCgroupSupportsCpuBW(virCgroupPtr cgroup ATTRIBUTE_UNUSED)
int
-virCgroupGetPercpuStats(virCgroupPtr group ATTRIBUTE_UNUSED,
- virTypedParameterPtr params ATTRIBUTE_UNUSED,
- unsigned int nparams ATTRIBUTE_UNUSED,
- int start_cpu ATTRIBUTE_UNUSED,
- unsigned int ncpus ATTRIBUTE_UNUSED,
- virBitmapPtr guestvcpus ATTRIBUTE_UNUSED)
+virCgroupGetPercpuStats(virCgroupPtr group G_GNUC_UNUSED,
+ virTypedParameterPtr params G_GNUC_UNUSED,
+ unsigned int nparams G_GNUC_UNUSED,
+ int start_cpu G_GNUC_UNUSED,
+ unsigned int ncpus G_GNUC_UNUSED,
+ virBitmapPtr guestvcpus G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3522,10 +3522,10 @@ virCgroupGetPercpuStats(virCgroupPtr group ATTRIBUTE_UNUSED,
int
-virCgroupSetOwner(virCgroupPtr cgroup ATTRIBUTE_UNUSED,
- uid_t uid ATTRIBUTE_UNUSED,
- gid_t gid ATTRIBUTE_UNUSED,
- int controllers ATTRIBUTE_UNUSED)
+virCgroupSetOwner(virCgroupPtr cgroup G_GNUC_UNUSED,
+ uid_t uid G_GNUC_UNUSED,
+ gid_t gid G_GNUC_UNUSED,
+ int controllers G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3533,8 +3533,8 @@ virCgroupSetOwner(virCgroupPtr cgroup ATTRIBUTE_UNUSED,
}
int
-virCgroupHasEmptyTasks(virCgroupPtr cgroup ATTRIBUTE_UNUSED,
- int controller ATTRIBUTE_UNUSED)
+virCgroupHasEmptyTasks(virCgroupPtr cgroup G_GNUC_UNUSED,
+ int controller G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Control groups not supported on this platform"));
@@ -3542,7 +3542,7 @@ virCgroupHasEmptyTasks(virCgroupPtr cgroup ATTRIBUTE_UNUSED,
}
bool
-virCgroupControllerAvailable(int controller ATTRIBUTE_UNUSED)
+virCgroupControllerAvailable(int controller G_GNUC_UNUSED)
{
return false;
}
diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
index 4231d8d6fa..23908d769d 100644
--- a/src/util/vircgroupv1.c
+++ b/src/util/vircgroupv1.c
@@ -421,7 +421,7 @@ virCgroupV1StealPlacement(virCgroupPtr group)
static int
virCgroupV1DetectControllers(virCgroupPtr group,
int controllers,
- virCgroupPtr parent ATTRIBUTE_UNUSED)
+ virCgroupPtr parent G_GNUC_UNUSED)
{
size_t i;
size_t j;
diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
index ace04bba04..ce8851f800 100644
--- a/src/util/vircgroupv2.c
+++ b/src/util/vircgroupv2.c
@@ -96,7 +96,7 @@ virCgroupV2Available(void)
static bool
virCgroupV2ValidateMachineGroup(virCgroupPtr group,
- const char *name ATTRIBUTE_UNUSED,
+ const char *name G_GNUC_UNUSED,
const char *drivername,
const char *machinename)
{
@@ -181,7 +181,7 @@ virCgroupV2CopyPlacement(virCgroupPtr group,
static int
virCgroupV2DetectMounts(virCgroupPtr group,
const char *mntType,
- const char *mntOpts ATTRIBUTE_UNUSED,
+ const char *mntOpts G_GNUC_UNUSED,
const char *mntDir)
{
if (STRNEQ(mntType, "cgroup2"))
@@ -227,7 +227,7 @@ virCgroupV2DetectPlacement(virCgroupPtr group,
static int
virCgroupV2ValidatePlacement(virCgroupPtr group,
- pid_t pid ATTRIBUTE_UNUSED)
+ pid_t pid G_GNUC_UNUSED)
{
if (!group->unified.placement) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -587,7 +587,7 @@ static int
virCgroupV2SetOwner(virCgroupPtr cgroup,
uid_t uid,
gid_t gid,
- int controllers ATTRIBUTE_UNUSED)
+ int controllers G_GNUC_UNUSED)
{
VIR_AUTOFREE(char *) base = NULL;
@@ -1725,15 +1725,15 @@ virCgroupV2GetCpusetMems(virCgroupPtr group,
static int
-virCgroupV2SetCpusetMemoryMigrate(virCgroupPtr group ATTRIBUTE_UNUSED,
- bool migrate ATTRIBUTE_UNUSED)
+virCgroupV2SetCpusetMemoryMigrate(virCgroupPtr group G_GNUC_UNUSED,
+ bool migrate G_GNUC_UNUSED)
{
return 0;
}
static int
-virCgroupV2GetCpusetMemoryMigrate(virCgroupPtr group ATTRIBUTE_UNUSED,
+virCgroupV2GetCpusetMemoryMigrate(virCgroupPtr group G_GNUC_UNUSED,
bool *migrate)
{
*migrate = true;
diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index 79e1e87964..763bcb6d12 100644
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -437,7 +437,7 @@ virExecCommon(virCommandPtr cmd, gid_t *groups, int ngroups)
* onto child process (well, the one we will exec soon since this
* is called from the child). */
static int
-virCommandMassCloseGetFDsLinux(virCommandPtr cmd ATTRIBUTE_UNUSED,
+virCommandMassCloseGetFDsLinux(virCommandPtr cmd G_GNUC_UNUSED,
virBitmapPtr fds)
{
DIR *dp = NULL;
@@ -474,7 +474,7 @@ virCommandMassCloseGetFDsLinux(virCommandPtr cmd ATTRIBUTE_UNUSED,
# else /* !__linux__ */
static int
-virCommandMassCloseGetFDsGeneric(virCommandPtr cmd ATTRIBUTE_UNUSED,
+virCommandMassCloseGetFDsGeneric(virCommandPtr cmd G_GNUC_UNUSED,
virBitmapPtr fds)
{
virBitmapSetAll(fds);
@@ -847,7 +847,7 @@ virRun(const char *const*argv, int *status)
#else /* WIN32 */
int
-virRun(const char *const *argv ATTRIBUTE_UNUSED,
+virRun(const char *const *argv G_GNUC_UNUSED,
int *status)
{
if (status)
@@ -859,7 +859,7 @@ virRun(const char *const *argv ATTRIBUTE_UNUSED,
}
static int
-virExec(virCommandPtr cmd ATTRIBUTE_UNUSED)
+virExec(virCommandPtr cmd G_GNUC_UNUSED)
{
/* XXX: Some day we can implement pieces of virCommand/virExec on
* top of _spawn() or CreateProcess(), but we can't implement
@@ -1187,7 +1187,7 @@ virCommandAllowCap(virCommandPtr cmd,
*/
void
virCommandSetSELinuxLabel(virCommandPtr cmd,
- const char *label ATTRIBUTE_UNUSED)
+ const char *label G_GNUC_UNUSED)
{
if (!cmd || cmd->has_error)
return;
@@ -1212,7 +1212,7 @@ virCommandSetSELinuxLabel(virCommandPtr cmd,
*/
void
virCommandSetAppArmorProfile(virCommandPtr cmd,
- const char *profile ATTRIBUTE_UNUSED)
+ const char *profile G_GNUC_UNUSED)
{
if (!cmd || cmd->has_error)
return;
@@ -1779,9 +1779,9 @@ virCommandSetSendBuffer(virCommandPtr cmd,
int
virCommandSetSendBuffer(virCommandPtr cmd,
- int fd ATTRIBUTE_UNUSED,
- unsigned char *buffer ATTRIBUTE_UNUSED,
- size_t buflen ATTRIBUTE_UNUSED)
+ int fd G_GNUC_UNUSED,
+ unsigned char *buffer G_GNUC_UNUSED,
+ size_t buflen G_GNUC_UNUSED)
{
if (!cmd || cmd->has_error)
return -1;
@@ -2355,8 +2355,8 @@ int virCommandExec(virCommandPtr cmd, gid_t *groups, int ngroups)
return -1;
}
#else
-int virCommandExec(virCommandPtr cmd ATTRIBUTE_UNUSED, gid_t *groups ATTRIBUTE_UNUSED,
- int ngroups ATTRIBUTE_UNUSED)
+int virCommandExec(virCommandPtr cmd G_GNUC_UNUSED, gid_t *groups G_GNUC_UNUSED,
+ int ngroups G_GNUC_UNUSED)
{
/* Mingw execve() has a broken signature. Disable this
* function until gnulib fixes the signature, since we
@@ -2795,7 +2795,7 @@ virCommandAbort(virCommandPtr cmd)
}
#else /* WIN32 */
void
-virCommandAbort(virCommandPtr cmd ATTRIBUTE_UNUSED)
+virCommandAbort(virCommandPtr cmd G_GNUC_UNUSED)
{
/* Mingw lacks WNOHANG and kill(). But since we haven't ported
* virExec to mingw yet, there's no process to be killed,
@@ -3317,14 +3317,14 @@ virCommandRunNul(virCommandPtr cmd,
#else /* WIN32 */
int
-virCommandRunRegex(virCommandPtr cmd ATTRIBUTE_UNUSED,
- int nregex ATTRIBUTE_UNUSED,
- const char **regex ATTRIBUTE_UNUSED,
- int *nvars ATTRIBUTE_UNUSED,
- virCommandRunRegexFunc func ATTRIBUTE_UNUSED,
- void *data ATTRIBUTE_UNUSED,
- const char *prefix ATTRIBUTE_UNUSED,
- int *exitstatus ATTRIBUTE_UNUSED)
+virCommandRunRegex(virCommandPtr cmd G_GNUC_UNUSED,
+ int nregex G_GNUC_UNUSED,
+ const char **regex G_GNUC_UNUSED,
+ int *nvars G_GNUC_UNUSED,
+ virCommandRunRegexFunc func G_GNUC_UNUSED,
+ void *data G_GNUC_UNUSED,
+ const char *prefix G_GNUC_UNUSED,
+ int *exitstatus G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
_("%s not implemented on Win32"), __FUNCTION__);
@@ -3332,10 +3332,10 @@ virCommandRunRegex(virCommandPtr cmd ATTRIBUTE_UNUSED,
}
int
-virCommandRunNul(virCommandPtr cmd ATTRIBUTE_UNUSED,
- size_t n_columns ATTRIBUTE_UNUSED,
- virCommandRunNulFunc func ATTRIBUTE_UNUSED,
- void *data ATTRIBUTE_UNUSED)
+virCommandRunNul(virCommandPtr cmd G_GNUC_UNUSED,
+ size_t n_columns G_GNUC_UNUSED,
+ virCommandRunNulFunc func G_GNUC_UNUSED,
+ void *data G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
_("%s not implemented on Win32"), __FUNCTION__);
diff --git a/src/util/virdbus.c b/src/util/virdbus.c
index b0ac8d7055..1e59294fc3 100644
--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
@@ -179,8 +179,8 @@ struct virDBusWatch
DBusConnection *bus;
};
-static void virDBusWatchCallback(int fdatch ATTRIBUTE_UNUSED,
- int fd ATTRIBUTE_UNUSED,
+static void virDBusWatchCallback(int fdatch G_GNUC_UNUSED,
+ int fd G_GNUC_UNUSED,
int events, void *opaque)
{
DBusWatch *watch = opaque;
@@ -262,7 +262,7 @@ static dbus_bool_t virDBusAddWatch(DBusWatch *watch,
static void virDBusRemoveWatch(DBusWatch *watch,
- void *data ATTRIBUTE_UNUSED)
+ void *data G_GNUC_UNUSED)
{
struct virDBusWatch *info;
@@ -273,7 +273,7 @@ static void virDBusRemoveWatch(DBusWatch *watch,
static void virDBusToggleWatch(DBusWatch *watch,
- void *data ATTRIBUTE_UNUSED)
+ void *data G_GNUC_UNUSED)
{
int flags = 0;
struct virDBusWatch *info;
@@ -1754,7 +1754,7 @@ void virDBusMessageUnref(DBusMessage *msg)
}
#else /* ! WITH_DBUS */
-void virDBusSetSharedBus(bool shared ATTRIBUTE_UNUSED)
+void virDBusSetSharedBus(bool shared G_GNUC_UNUSED)
{
/* nothing */
}
@@ -1786,56 +1786,56 @@ DBusConnection *virDBusGetSessionBus(void)
return NULL;
}
-int virDBusCreateMethod(DBusMessage **call ATTRIBUTE_UNUSED,
- const char *destination ATTRIBUTE_UNUSED,
- const char *path ATTRIBUTE_UNUSED,
- const char *iface ATTRIBUTE_UNUSED,
- const char *member ATTRIBUTE_UNUSED,
- const char *types ATTRIBUTE_UNUSED, ...)
+int virDBusCreateMethod(DBusMessage **call G_GNUC_UNUSED,
+ const char *destination G_GNUC_UNUSED,
+ const char *path G_GNUC_UNUSED,
+ const char *iface G_GNUC_UNUSED,
+ const char *member G_GNUC_UNUSED,
+ const char *types G_GNUC_UNUSED, ...)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("DBus support not compiled into this binary"));
return -1;
}
-int virDBusCreateMethodV(DBusMessage **call ATTRIBUTE_UNUSED,
- const char *destination ATTRIBUTE_UNUSED,
- const char *path ATTRIBUTE_UNUSED,
- const char *iface ATTRIBUTE_UNUSED,
- const char *member ATTRIBUTE_UNUSED,
- const char *types ATTRIBUTE_UNUSED,
- va_list args ATTRIBUTE_UNUSED)
+int virDBusCreateMethodV(DBusMessage **call G_GNUC_UNUSED,
+ const char *destination G_GNUC_UNUSED,
+ const char *path G_GNUC_UNUSED,
+ const char *iface G_GNUC_UNUSED,
+ const char *member G_GNUC_UNUSED,
+ const char *types G_GNUC_UNUSED,
+ va_list args G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("DBus support not compiled into this binary"));
return -1;
}
-int virDBusCreateReplyV(DBusMessage **reply ATTRIBUTE_UNUSED,
- const char *types ATTRIBUTE_UNUSED,
- va_list args ATTRIBUTE_UNUSED)
+int virDBusCreateReplyV(DBusMessage **reply G_GNUC_UNUSED,
+ const char *types G_GNUC_UNUSED,
+ va_list args G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("DBus support not compiled into this binary"));
return -1;
}
-int virDBusCreateReply(DBusMessage **reply ATTRIBUTE_UNUSED,
- const char *types ATTRIBUTE_UNUSED, ...)
+int virDBusCreateReply(DBusMessage **reply G_GNUC_UNUSED,
+ const char *types G_GNUC_UNUSED, ...)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("DBus support not compiled into this binary"));
return -1;
}
-int virDBusCallMethod(DBusConnection *conn ATTRIBUTE_UNUSED,
- DBusMessage **reply ATTRIBUTE_UNUSED,
- virErrorPtr error ATTRIBUTE_UNUSED,
- const char *destination ATTRIBUTE_UNUSED,
- const char *path ATTRIBUTE_UNUSED,
- const char *iface ATTRIBUTE_UNUSED,
- const char *member ATTRIBUTE_UNUSED,
- const char *types ATTRIBUTE_UNUSED, ...)
+int virDBusCallMethod(DBusConnection *conn G_GNUC_UNUSED,
+ DBusMessage **reply G_GNUC_UNUSED,
+ virErrorPtr error G_GNUC_UNUSED,
+ const char *destination G_GNUC_UNUSED,
+ const char *path G_GNUC_UNUSED,
+ const char *iface G_GNUC_UNUSED,
+ const char *member G_GNUC_UNUSED,
+ const char *types G_GNUC_UNUSED, ...)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("DBus support not compiled into this binary"));
@@ -1843,8 +1843,8 @@ int virDBusCallMethod(DBusConnection *conn ATTRIBUTE_UNUSED,
}
-int virDBusMessageEncode(DBusMessage* msg ATTRIBUTE_UNUSED,
- const char *types ATTRIBUTE_UNUSED,
+int virDBusMessageEncode(DBusMessage* msg G_GNUC_UNUSED,
+ const char *types G_GNUC_UNUSED,
...)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -1852,8 +1852,8 @@ int virDBusMessageEncode(DBusMessage* msg ATTRIBUTE_UNUSED,
return -1;
}
-int virDBusMessageDecode(DBusMessage* msg ATTRIBUTE_UNUSED,
- const char *types ATTRIBUTE_UNUSED,
+int virDBusMessageDecode(DBusMessage* msg G_GNUC_UNUSED,
+ const char *types G_GNUC_UNUSED,
...)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -1861,19 +1861,19 @@ int virDBusMessageDecode(DBusMessage* msg ATTRIBUTE_UNUSED,
return -1;
}
-int virDBusIsServiceEnabled(const char *name ATTRIBUTE_UNUSED)
+int virDBusIsServiceEnabled(const char *name G_GNUC_UNUSED)
{
VIR_DEBUG("DBus support not compiled into this binary");
return -2;
}
-int virDBusIsServiceRegistered(const char *name ATTRIBUTE_UNUSED)
+int virDBusIsServiceRegistered(const char *name G_GNUC_UNUSED)
{
VIR_DEBUG("DBus support not compiled into this binary");
return -2;
}
-void virDBusMessageUnref(DBusMessage *msg ATTRIBUTE_UNUSED)
+void virDBusMessageUnref(DBusMessage *msg G_GNUC_UNUSED)
{
/* nothing */
}
diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
index 81e20c9df0..1abd8044e7 100644
--- a/src/util/virdevmapper.c
+++ b/src/util/virdevmapper.c
@@ -38,11 +38,11 @@
#ifdef WITH_DEVMAPPER
static void
-virDevMapperDummyLogger(int level ATTRIBUTE_UNUSED,
- const char *file ATTRIBUTE_UNUSED,
- int line ATTRIBUTE_UNUSED,
- int dm_errno ATTRIBUTE_UNUSED,
- const char *fmt ATTRIBUTE_UNUSED,
+virDevMapperDummyLogger(int level G_GNUC_UNUSED,
+ const char *file G_GNUC_UNUSED,
+ int line G_GNUC_UNUSED,
+ int dm_errno G_GNUC_UNUSED,
+ const char *fmt G_GNUC_UNUSED,
...)
{
return;
@@ -198,8 +198,8 @@ virDevMapperGetTargets(const char *path,
#else /* ! WITH_DEVMAPPER */
int
-virDevMapperGetTargets(const char *path ATTRIBUTE_UNUSED,
- char ***devPaths ATTRIBUTE_UNUSED)
+virDevMapperGetTargets(const char *path G_GNUC_UNUSED,
+ char ***devPaths G_GNUC_UNUSED)
{
errno = ENOSYS;
return -1;
diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index 42f62682c4..9aeb7b120d 100644
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -595,7 +595,7 @@ dnsmasqDelete(const dnsmasqContext *ctx)
* Reloads all the configurations associated to a context
*/
int
-dnsmasqReload(pid_t pid ATTRIBUTE_UNUSED)
+dnsmasqReload(pid_t pid G_GNUC_UNUSED)
{
#ifndef WIN32
if (kill(pid, SIGHUP) != 0) {
diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c
index db01088769..b57b300446 100644
--- a/src/util/vireventpoll.c
+++ b/src/util/vireventpoll.c
@@ -674,10 +674,10 @@ int virEventPollRunOnce(void)
}
-static void virEventPollHandleWakeup(int watch ATTRIBUTE_UNUSED,
+static void virEventPollHandleWakeup(int watch G_GNUC_UNUSED,
int fd,
- int events ATTRIBUTE_UNUSED,
- void *opaque ATTRIBUTE_UNUSED)
+ int events G_GNUC_UNUSED,
+ void *opaque G_GNUC_UNUSED)
{
char c;
virMutexLock(&eventLoop.lock);
diff --git a/src/util/virfcp.c b/src/util/virfcp.c
index 3cb6811f78..9fe86e362e 100644
--- a/src/util/virfcp.c
+++ b/src/util/virfcp.c
@@ -71,16 +71,16 @@ virFCReadRportValue(const char *rport,
#else
bool
-virFCIsCapableRport(const char *rport ATTRIBUTE_UNUSED)
+virFCIsCapableRport(const char *rport G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s", _("Not supported on this platform"));
return false;
}
int
-virFCReadRportValue(const char *rport ATTRIBUTE_UNUSED,
- const char *entry ATTRIBUTE_UNUSED,
- char **result ATTRIBUTE_UNUSED)
+virFCReadRportValue(const char *rport G_GNUC_UNUSED,
+ const char *entry G_GNUC_UNUSED,
+ char **result G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s", _("Not supported on this platform"));
return -1;
diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c
index 1bc43e20a1..693f1619b3 100644
--- a/src/util/virfdstream.c
+++ b/src/util/virfdstream.c
@@ -289,8 +289,8 @@ static int virFDStreamUpdateCallback(virStreamPtr stream, int events)
return ret;
}
-static void virFDStreamEvent(int watch ATTRIBUTE_UNUSED,
- int fd ATTRIBUTE_UNUSED,
+static void virFDStreamEvent(int watch G_GNUC_UNUSED,
+ int fd G_GNUC_UNUSED,
int events,
void *opaque)
{
@@ -1212,9 +1212,9 @@ int virFDStreamConnectUNIX(virStreamPtr st,
return -1;
}
#else
-int virFDStreamConnectUNIX(virStreamPtr st ATTRIBUTE_UNUSED,
- const char *path ATTRIBUTE_UNUSED,
- bool abstract ATTRIBUTE_UNUSED)
+int virFDStreamConnectUNIX(virStreamPtr st G_GNUC_UNUSED,
+ const char *path G_GNUC_UNUSED,
+ bool abstract G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("UNIX domain sockets are not supported on this platform"));
diff --git a/src/util/virfile.c b/src/util/virfile.c
index dead335c62..7d6a9011c6 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -106,7 +106,7 @@ int virFileClose(int *fdptr, virFileCloseFlags flags)
if (!(flags & VIR_FILE_CLOSE_IGNORE_EBADF))
VIR_WARN("Tried to close invalid fd %d", *fdptr);
} else {
- char ebuf[1024] ATTRIBUTE_UNUSED;
+ char ebuf[1024] G_GNUC_UNUSED;
VIR_DEBUG("Failed to close fd %d: %s",
*fdptr, virStrerror(errno, ebuf, sizeof(ebuf)));
}
@@ -304,9 +304,9 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned int flags)
}
#else
virFileWrapperFdPtr
-virFileWrapperFdNew(int *fd ATTRIBUTE_UNUSED,
- const char *name ATTRIBUTE_UNUSED,
- unsigned int fdflags ATTRIBUTE_UNUSED)
+virFileWrapperFdNew(int *fd G_GNUC_UNUSED,
+ const char *name G_GNUC_UNUSED,
+ unsigned int fdflags G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("virFileWrapperFd unsupported on this platform"));
@@ -469,27 +469,27 @@ int virFileFlock(int fd, bool lock, bool shared)
#else
-int virFileLock(int fd ATTRIBUTE_UNUSED,
- bool shared ATTRIBUTE_UNUSED,
- off_t start ATTRIBUTE_UNUSED,
- off_t len ATTRIBUTE_UNUSED,
- bool waitForLock ATTRIBUTE_UNUSED)
+int virFileLock(int fd G_GNUC_UNUSED,
+ bool shared G_GNUC_UNUSED,
+ off_t start G_GNUC_UNUSED,
+ off_t len G_GNUC_UNUSED,
+ bool waitForLock G_GNUC_UNUSED)
{
return -ENOSYS;
}
-int virFileUnlock(int fd ATTRIBUTE_UNUSED,
- off_t start ATTRIBUTE_UNUSED,
- off_t len ATTRIBUTE_UNUSED)
+int virFileUnlock(int fd G_GNUC_UNUSED,
+ off_t start G_GNUC_UNUSED,
+ off_t len G_GNUC_UNUSED)
{
return -ENOSYS;
}
-int virFileFlock(int fd ATTRIBUTE_UNUSED,
- bool lock ATTRIBUTE_UNUSED,
- bool shared ATTRIBUTE_UNUSED)
+int virFileFlock(int fd G_GNUC_UNUSED,
+ bool lock G_GNUC_UNUSED,
+ bool shared G_GNUC_UNUSED)
{
errno = ENOSYS;
return -1;
@@ -960,7 +960,7 @@ int virFileNBDDeviceAssociate(const char *file,
#else /* __linux__ */
int virFileLoopDeviceAssociate(const char *file,
- char **dev ATTRIBUTE_UNUSED)
+ char **dev G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS,
_("Unable to associate file %s with loop device"),
@@ -970,9 +970,9 @@ int virFileLoopDeviceAssociate(const char *file,
}
int virFileNBDDeviceAssociate(const char *file,
- virStorageFileFormat fmt ATTRIBUTE_UNUSED,
- bool readonly ATTRIBUTE_UNUSED,
- char **dev ATTRIBUTE_UNUSED)
+ virStorageFileFormat fmt G_GNUC_UNUSED,
+ bool readonly G_GNUC_UNUSED,
+ char **dev G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS,
_("Unable to associate file %s with NBD device"),
@@ -1113,9 +1113,9 @@ safezero_posix_fallocate(int fd, off_t offset, off_t len)
}
#else /* !HAVE_POSIX_FALLOCATE */
static int
-safezero_posix_fallocate(int fd ATTRIBUTE_UNUSED,
- off_t offset ATTRIBUTE_UNUSED,
- off_t len ATTRIBUTE_UNUSED)
+safezero_posix_fallocate(int fd G_GNUC_UNUSED,
+ off_t offset G_GNUC_UNUSED,
+ off_t len G_GNUC_UNUSED)
{
return -2;
}
@@ -1131,9 +1131,9 @@ safezero_sys_fallocate(int fd,
}
#else /* !HAVE_SYS_SYSCALL_H || !defined(SYS_fallocate) */
static int
-safezero_sys_fallocate(int fd ATTRIBUTE_UNUSED,
- off_t offset ATTRIBUTE_UNUSED,
- off_t len ATTRIBUTE_UNUSED)
+safezero_sys_fallocate(int fd G_GNUC_UNUSED,
+ off_t offset G_GNUC_UNUSED,
+ off_t len G_GNUC_UNUSED)
{
return -2;
}
@@ -1175,9 +1175,9 @@ safezero_mmap(int fd, off_t offset, off_t len)
}
#else /* !HAVE_MMAP */
static int
-safezero_mmap(int fd ATTRIBUTE_UNUSED,
- off_t offset ATTRIBUTE_UNUSED,
- off_t len ATTRIBUTE_UNUSED)
+safezero_mmap(int fd G_GNUC_UNUSED,
+ off_t offset G_GNUC_UNUSED,
+ off_t len G_GNUC_UNUSED)
{
return -2;
}
@@ -1281,7 +1281,7 @@ virFileFindMountPoint(const char *type)
#else /* defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R */
char *
-virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
+virFileFindMountPoint(const char *type G_GNUC_UNUSED)
{
errno = ENOSYS;
@@ -2043,11 +2043,11 @@ virFileGetMountSubtreeImpl(const char *mtabpath,
}
#else /* ! defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R */
static int
-virFileGetMountSubtreeImpl(const char *mtabpath ATTRIBUTE_UNUSED,
- const char *prefix ATTRIBUTE_UNUSED,
- char ***mountsret ATTRIBUTE_UNUSED,
- size_t *nmountsret ATTRIBUTE_UNUSED,
- bool reverse ATTRIBUTE_UNUSED)
+virFileGetMountSubtreeImpl(const char *mtabpath G_GNUC_UNUSED,
+ const char *prefix G_GNUC_UNUSED,
+ char ***mountsret G_GNUC_UNUSED,
+ size_t *nmountsret G_GNUC_UNUSED,
+ bool reverse G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to determine mount table on this platform"));
@@ -2803,8 +2803,8 @@ virDirCreate(const char *path,
int
virFileAccessibleAs(const char *path,
int mode,
- uid_t uid ATTRIBUTE_UNUSED,
- gid_t gid ATTRIBUTE_UNUSED)
+ uid_t uid G_GNUC_UNUSED,
+ gid_t gid G_GNUC_UNUSED)
{
VIR_WARN("Ignoring uid/gid due to WIN32");
@@ -2813,12 +2813,12 @@ virFileAccessibleAs(const char *path,
/* return -errno on failure, or 0 on success */
int
-virFileOpenAs(const char *path ATTRIBUTE_UNUSED,
- int openflags ATTRIBUTE_UNUSED,
- mode_t mode ATTRIBUTE_UNUSED,
- uid_t uid ATTRIBUTE_UNUSED,
- gid_t gid ATTRIBUTE_UNUSED,
- unsigned int flags_unused ATTRIBUTE_UNUSED)
+virFileOpenAs(const char *path G_GNUC_UNUSED,
+ int openflags G_GNUC_UNUSED,
+ mode_t mode G_GNUC_UNUSED,
+ uid_t uid G_GNUC_UNUSED,
+ gid_t gid G_GNUC_UNUSED,
+ unsigned int flags_unused G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("virFileOpenAs is not implemented for WIN32"));
@@ -2827,11 +2827,11 @@ virFileOpenAs(const char *path ATTRIBUTE_UNUSED,
}
int
-virDirCreate(const char *path ATTRIBUTE_UNUSED,
- mode_t mode ATTRIBUTE_UNUSED,
- uid_t uid ATTRIBUTE_UNUSED,
- gid_t gid ATTRIBUTE_UNUSED,
- unsigned int flags_unused ATTRIBUTE_UNUSED)
+virDirCreate(const char *path G_GNUC_UNUSED,
+ mode_t mode G_GNUC_UNUSED,
+ uid_t uid G_GNUC_UNUSED,
+ gid_t gid G_GNUC_UNUSED,
+ unsigned int flags_unused G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("virDirCreate is not implemented for WIN32"));
@@ -2841,8 +2841,8 @@ virDirCreate(const char *path ATTRIBUTE_UNUSED,
int
virFileRemove(const char *path,
- uid_t uid ATTRIBUTE_UNUSED,
- gid_t gid ATTRIBUTE_UNUSED)
+ uid_t uid G_GNUC_UNUSED,
+ gid_t gid G_GNUC_UNUSED)
{
if (unlink(path) < 0) {
virReportSystemError(errno, _("Unable to unlink path '%s'"),
@@ -3198,9 +3198,9 @@ virFileOpenTty(int *ttymaster, char **ttyName, int rawmode)
}
#else /* WIN32 */
int
-virFileOpenTty(int *ttymaster ATTRIBUTE_UNUSED,
- char **ttyName ATTRIBUTE_UNUSED,
- int rawmode ATTRIBUTE_UNUSED)
+virFileOpenTty(int *ttymaster G_GNUC_UNUSED,
+ char **ttyName G_GNUC_UNUSED,
+ int rawmode G_GNUC_UNUSED)
{
/* mingw completely lacks pseudo-terminals, and the gnulib
* replacements are not (yet) license compatible. */
@@ -3741,16 +3741,16 @@ virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs,
#else /* defined __linux__ */
-int virFileIsSharedFSType(const char *path ATTRIBUTE_UNUSED,
- int fstypes ATTRIBUTE_UNUSED)
+int virFileIsSharedFSType(const char *path G_GNUC_UNUSED,
+ int fstypes G_GNUC_UNUSED)
{
/* XXX implement me :-) */
return 0;
}
int
-virFileGetHugepageSize(const char *path ATTRIBUTE_UNUSED,
- unsigned long long *size ATTRIBUTE_UNUSED)
+virFileGetHugepageSize(const char *path G_GNUC_UNUSED,
+ unsigned long long *size G_GNUC_UNUSED)
{
/* XXX implement me :-) */
virReportUnsupportedError();
@@ -3758,8 +3758,8 @@ virFileGetHugepageSize(const char *path ATTRIBUTE_UNUSED,
}
int
-virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs ATTRIBUTE_UNUSED,
- size_t *ret_nfs ATTRIBUTE_UNUSED)
+virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs G_GNUC_UNUSED,
+ size_t *ret_nfs G_GNUC_UNUSED)
{
/* XXX implement me :-) */
virReportUnsupportedError();
@@ -3874,8 +3874,8 @@ virFileMoveMount(const char *src,
#else /* !defined(__linux__) || !defined(HAVE_SYS_MOUNT_H) */
int
-virFileSetupDev(const char *path ATTRIBUTE_UNUSED,
- const char *mount_options ATTRIBUTE_UNUSED)
+virFileSetupDev(const char *path G_GNUC_UNUSED,
+ const char *mount_options G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("mount is not supported on this platform."));
@@ -3884,8 +3884,8 @@ virFileSetupDev(const char *path ATTRIBUTE_UNUSED,
int
-virFileBindMountDevice(const char *src ATTRIBUTE_UNUSED,
- const char *dst ATTRIBUTE_UNUSED)
+virFileBindMountDevice(const char *src G_GNUC_UNUSED,
+ const char *dst G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("mount is not supported on this platform."));
@@ -3894,8 +3894,8 @@ virFileBindMountDevice(const char *src ATTRIBUTE_UNUSED,
int
-virFileMoveMount(const char *src ATTRIBUTE_UNUSED,
- const char *dst ATTRIBUTE_UNUSED)
+virFileMoveMount(const char *src G_GNUC_UNUSED,
+ const char *dst G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("mount move is not supported on this platform."));
@@ -3937,8 +3937,8 @@ virFileFreeACLs(void **acl)
#else /* !defined(HAVE_SYS_ACL_H) */
int
-virFileGetACLs(const char *file ATTRIBUTE_UNUSED,
- void **acl ATTRIBUTE_UNUSED)
+virFileGetACLs(const char *file G_GNUC_UNUSED,
+ void **acl G_GNUC_UNUSED)
{
errno = ENOTSUP;
return -1;
@@ -3946,8 +3946,8 @@ virFileGetACLs(const char *file ATTRIBUTE_UNUSED,
int
-virFileSetACLs(const char *file ATTRIBUTE_UNUSED,
- void *acl ATTRIBUTE_UNUSED)
+virFileSetACLs(const char *file G_GNUC_UNUSED,
+ void *acl G_GNUC_UNUSED)
{
errno = ENOTSUP;
return -1;
@@ -4140,9 +4140,9 @@ virFileInData(int fd,
#else /* !HAVE_DECL_SEEK_HOLE */
int
-virFileInData(int fd ATTRIBUTE_UNUSED,
- int *inData ATTRIBUTE_UNUSED,
- long long *length ATTRIBUTE_UNUSED)
+virFileInData(int fd G_GNUC_UNUSED,
+ int *inData G_GNUC_UNUSED,
+ long long *length G_GNUC_UNUSED)
{
errno = ENOSYS;
virReportSystemError(errno, "%s",
@@ -4497,9 +4497,9 @@ virFileRemoveXAttr(const char *path,
#else /* !HAVE_LIBATTR */
int
-virFileGetXAttrQuiet(const char *path ATTRIBUTE_UNUSED,
- const char *name ATTRIBUTE_UNUSED,
- char **value ATTRIBUTE_UNUSED)
+virFileGetXAttrQuiet(const char *path G_GNUC_UNUSED,
+ const char *name G_GNUC_UNUSED,
+ char **value G_GNUC_UNUSED)
{
errno = ENOSYS;
return -1;
@@ -4508,7 +4508,7 @@ virFileGetXAttrQuiet(const char *path ATTRIBUTE_UNUSED,
int
virFileSetXAttr(const char *path,
const char *name,
- const char *value ATTRIBUTE_UNUSED)
+ const char *value G_GNUC_UNUSED)
{
errno = ENOSYS;
virReportSystemError(errno,
diff --git a/src/util/virhash.c b/src/util/virhash.c
index 0e30106041..a7fc620567 100644
--- a/src/util/virhash.c
+++ b/src/util/virhash.c
@@ -105,7 +105,7 @@ static void virHashStrFree(void *name)
void
-virHashValueFree(void *value, const void *name ATTRIBUTE_UNUSED)
+virHashValueFree(void *value, const void *name G_GNUC_UNUSED)
{
VIR_FREE(value);
}
@@ -640,9 +640,9 @@ virHashRemoveSet(virHashTablePtr table,
}
static int
-_virHashRemoveAllIter(const void *payload ATTRIBUTE_UNUSED,
- const void *name ATTRIBUTE_UNUSED,
- const void *data ATTRIBUTE_UNUSED)
+_virHashRemoveAllIter(const void *payload G_GNUC_UNUSED,
+ const void *name G_GNUC_UNUSED,
+ const void *data G_GNUC_UNUSED)
{
return 1;
}
diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index 83e4853006..952766dc3a 100644
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -910,13 +910,13 @@ virHostCPUStatsAssign(virNodeCPUStatsPtr param,
int
-virHostCPUGetInfo(virArch hostarch ATTRIBUTE_UNUSED,
- unsigned int *cpus ATTRIBUTE_UNUSED,
- unsigned int *mhz ATTRIBUTE_UNUSED,
- unsigned int *nodes ATTRIBUTE_UNUSED,
- unsigned int *sockets ATTRIBUTE_UNUSED,
- unsigned int *cores ATTRIBUTE_UNUSED,
- unsigned int *threads ATTRIBUTE_UNUSED)
+virHostCPUGetInfo(virArch hostarch G_GNUC_UNUSED,
+ unsigned int *cpus G_GNUC_UNUSED,
+ unsigned int *mhz G_GNUC_UNUSED,
+ unsigned int *nodes G_GNUC_UNUSED,
+ unsigned int *sockets G_GNUC_UNUSED,
+ unsigned int *cores G_GNUC_UNUSED,
+ unsigned int *threads G_GNUC_UNUSED)
{
#ifdef __linux__
int ret = -1;
@@ -984,9 +984,9 @@ virHostCPUGetInfo(virArch hostarch ATTRIBUTE_UNUSED,
int
-virHostCPUGetStats(int cpuNum ATTRIBUTE_UNUSED,
- virNodeCPUStatsPtr params ATTRIBUTE_UNUSED,
- int *nparams ATTRIBUTE_UNUSED,
+virHostCPUGetStats(int cpuNum G_GNUC_UNUSED,
+ virNodeCPUStatsPtr params G_GNUC_UNUSED,
+ int *nparams G_GNUC_UNUSED,
unsigned int flags)
{
virCheckFlags(0, -1);
@@ -1160,7 +1160,7 @@ virHostCPUGetThreadsPerSubcore(virArch arch)
/* Fallback for nodeGetThreadsPerSubcore() used when KVM headers
* are not available on the system */
int
-virHostCPUGetThreadsPerSubcore(virArch arch ATTRIBUTE_UNUSED)
+virHostCPUGetThreadsPerSubcore(virArch arch G_GNUC_UNUSED)
{
return 0;
}
@@ -1389,8 +1389,8 @@ virHostCPUGetTscInfo(void)
#else
int
-virHostCPUGetMSR(unsigned long index ATTRIBUTE_UNUSED,
- uint64_t *msr ATTRIBUTE_UNUSED)
+virHostCPUGetMSR(unsigned long index G_GNUC_UNUSED,
+ uint64_t *msr G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Reading MSRs is not supported on this platform"));
diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c
index d16e0217e5..8e86bedaab 100644
--- a/src/util/virhostmem.c
+++ b/src/util/virhostmem.c
@@ -245,9 +245,9 @@ virHostMemGetStatsLinux(FILE *meminfo,
int
-virHostMemGetStats(int cellNum ATTRIBUTE_UNUSED,
- virNodeMemoryStatsPtr params ATTRIBUTE_UNUSED,
- int *nparams ATTRIBUTE_UNUSED,
+virHostMemGetStats(int cellNum G_GNUC_UNUSED,
+ virNodeMemoryStatsPtr params G_GNUC_UNUSED,
+ int *nparams G_GNUC_UNUSED,
unsigned int flags)
{
virCheckFlags(0, -1);
@@ -364,8 +364,8 @@ virHostMemParametersAreAllSupported(virTypedParameterPtr params,
#endif
int
-virHostMemSetParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED,
- int nparams ATTRIBUTE_UNUSED,
+virHostMemSetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
+ int nparams G_GNUC_UNUSED,
unsigned int flags)
{
virCheckFlags(0, -1);
@@ -449,8 +449,8 @@ virHostMemGetParameterValue(const char *field,
#define NODE_MEMORY_PARAMETERS_NUM 8
int
-virHostMemGetParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED,
- int *nparams ATTRIBUTE_UNUSED,
+virHostMemGetParameters(virTypedParameterPtr params G_GNUC_UNUSED,
+ int *nparams G_GNUC_UNUSED,
unsigned int flags)
{
virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1);
@@ -595,7 +595,7 @@ virHostMemGetParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED,
static int
virHostMemGetCellsFreeFake(unsigned long long *freeMems,
int startCell,
- int maxCells ATTRIBUTE_UNUSED)
+ int maxCells G_GNUC_UNUSED)
{
double avail = physmem_available();
diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c
index 6966e8a3e9..955e8f398e 100644
--- a/src/util/virinitctl.c
+++ b/src/util/virinitctl.c
@@ -189,8 +189,8 @@ const char *virInitctlFifos[] = {
NULL
};
-int virInitctlSetRunLevel(const char *fifo ATTRIBUTE_UNUSED,
- virInitctlRunLevel level ATTRIBUTE_UNUSED)
+int virInitctlSetRunLevel(const char *fifo G_GNUC_UNUSED,
+ virInitctlRunLevel level G_GNUC_UNUSED)
{
virReportUnsupportedError();
return -1;
diff --git a/src/util/virjson.c b/src/util/virjson.c
index 1cf2fb1e5c..07b3e8823c 100644
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -432,7 +432,7 @@ virJSONValueFree(virJSONValuePtr value)
void
virJSONValueHashFree(void *opaque,
- const void *name ATTRIBUTE_UNUSED)
+ const void *name G_GNUC_UNUSED)
{
virJSONValueFree(opaque);
}
@@ -2001,7 +2001,7 @@ virJSONValueToBuffer(virJSONValuePtr object,
#else
virJSONValuePtr
-virJSONValueFromString(const char *jsonstring ATTRIBUTE_UNUSED)
+virJSONValueFromString(const char *jsonstring G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("No JSON parser implementation is available"));
@@ -2010,9 +2010,9 @@ virJSONValueFromString(const char *jsonstring ATTRIBUTE_UNUSED)
int
-virJSONValueToBuffer(virJSONValuePtr object ATTRIBUTE_UNUSED,
- virBufferPtr buf ATTRIBUTE_UNUSED,
- bool pretty ATTRIBUTE_UNUSED)
+virJSONValueToBuffer(virJSONValuePtr object G_GNUC_UNUSED,
+ virBufferPtr buf G_GNUC_UNUSED,
+ bool pretty G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("No JSON parser implementation is available"));
diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c
index 201fabe8bf..c7e756d26a 100644
--- a/src/util/virkeyfile.c
+++ b/src/util/virkeyfile.c
@@ -265,7 +265,7 @@ static int virKeyFileParse(virKeyFilePtr conf,
}
-static void virKeyFileEntryFree(void *payload, const void *name ATTRIBUTE_UNUSED)
+static void virKeyFileEntryFree(void *payload, const void *name G_GNUC_UNUSED)
{
virHashFree(payload);
}
diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c
index 0736b4b85b..c8e520c672 100644
--- a/src/util/virlockspace.c
+++ b/src/util/virlockspace.c
@@ -174,7 +174,7 @@ virLockSpaceResourceNew(virLockSpacePtr lockspace,
* one that now exists on the filesystem
*/
if (stat(res->path, &a) < 0) {
- char ebuf[1024] ATTRIBUTE_UNUSED;
+ char ebuf[1024] G_GNUC_UNUSED;
VIR_DEBUG("Resource '%s' disappeared: %s",
res->path, virStrerror(errno, ebuf, sizeof(ebuf)));
VIR_FORCE_CLOSE(res->fd);
@@ -232,7 +232,7 @@ virLockSpaceResourceNew(virLockSpacePtr lockspace,
}
-static void virLockSpaceResourceDataFree(void *opaque, const void *name ATTRIBUTE_UNUSED)
+static void virLockSpaceResourceDataFree(void *opaque, const void *name G_GNUC_UNUSED)
{
virLockSpaceResourcePtr res = opaque;
virLockSpaceResourceFree(res);
@@ -712,7 +712,7 @@ struct virLockSpaceRemoveData {
static int
virLockSpaceRemoveResourcesForOwner(const void *payload,
- const void *name ATTRIBUTE_UNUSED,
+ const void *name G_GNUC_UNUSED,
const void *opaque)
{
virLockSpaceResourcePtr res = (virLockSpaceResourcePtr)payload;
diff --git a/src/util/virlog.c b/src/util/virlog.c
index 4c76fbc5a4..4414a8fa63 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -714,15 +714,15 @@ virLogStackTraceToFd(int fd)
}
static void
-virLogOutputToFd(virLogSourcePtr source ATTRIBUTE_UNUSED,
- virLogPriority priority ATTRIBUTE_UNUSED,
- const char *filename ATTRIBUTE_UNUSED,
- int linenr ATTRIBUTE_UNUSED,
- const char *funcname ATTRIBUTE_UNUSED,
+virLogOutputToFd(virLogSourcePtr source G_GNUC_UNUSED,
+ virLogPriority priority G_GNUC_UNUSED,
+ const char *filename G_GNUC_UNUSED,
+ int linenr G_GNUC_UNUSED,
+ const char *funcname G_GNUC_UNUSED,
const char *timestamp,
- virLogMetadataPtr metadata ATTRIBUTE_UNUSED,
+ virLogMetadataPtr metadata G_GNUC_UNUSED,
unsigned int flags,
- const char *rawstr ATTRIBUTE_UNUSED,
+ const char *rawstr G_GNUC_UNUSED,
const char *str,
void *data)
{
@@ -820,17 +820,17 @@ virLogPrioritySyslog(virLogPriority priority)
#if HAVE_SYSLOG_H
static void
-virLogOutputToSyslog(virLogSourcePtr source ATTRIBUTE_UNUSED,
+virLogOutputToSyslog(virLogSourcePtr source G_GNUC_UNUSED,
virLogPriority priority,
- const char *filename ATTRIBUTE_UNUSED,
- int linenr ATTRIBUTE_UNUSED,
- const char *funcname ATTRIBUTE_UNUSED,
- const char *timestamp ATTRIBUTE_UNUSED,
- virLogMetadataPtr metadata ATTRIBUTE_UNUSED,
+ const char *filename G_GNUC_UNUSED,
+ int linenr G_GNUC_UNUSED,
+ const char *funcname G_GNUC_UNUSED,
+ const char *timestamp G_GNUC_UNUSED,
+ virLogMetadataPtr metadata G_GNUC_UNUSED,
unsigned int flags,
- const char *rawstr ATTRIBUTE_UNUSED,
+ const char *rawstr G_GNUC_UNUSED,
const char *str,
- void *data ATTRIBUTE_UNUSED)
+ void *data G_GNUC_UNUSED)
{
virCheckFlags(VIR_LOG_STACK_TRACE,);
@@ -841,7 +841,7 @@ static char *current_ident;
static void
-virLogCloseSyslog(void *data ATTRIBUTE_UNUSED)
+virLogCloseSyslog(void *data G_GNUC_UNUSED)
{
closelog();
VIR_FREE(current_ident);
@@ -973,11 +973,11 @@ virLogOutputToJournald(virLogSourcePtr source,
const char *filename,
int linenr,
const char *funcname,
- const char *timestamp ATTRIBUTE_UNUSED,
+ const char *timestamp G_GNUC_UNUSED,
virLogMetadataPtr metadata,
unsigned int flags,
const char *rawstr,
- const char *str ATTRIBUTE_UNUSED,
+ const char *str G_GNUC_UNUSED,
void *data)
{
virCheckFlags(VIR_LOG_STACK_TRACE,);
@@ -1133,7 +1133,7 @@ int virLogPriorityFromSyslog(int priority)
}
#else /* HAVE_SYSLOG_H */
-int virLogPriorityFromSyslog(int priority ATTRIBUTE_UNUSED)
+int virLogPriorityFromSyslog(int priority G_GNUC_UNUSED)
{
return VIR_LOG_ERROR;
}
diff --git a/src/util/virlog.h b/src/util/virlog.h
index a30b760fb4..b4feb5b1b9 100644
--- a/src/util/virlog.h
+++ b/src/util/virlog.h
@@ -68,12 +68,12 @@ struct _virLogSource {
};
/*
- * ATTRIBUTE_UNUSED is to make gcc keep quiet if all the
+ * G_GNUC_UNUSED is to make gcc keep quiet if all the
* log statements in a file are conditionally disabled
* at compile time due to configure options.
*/
#define VIR_LOG_INIT(n) \
- static ATTRIBUTE_UNUSED virLogSource virLogSelf = { \
+ static G_GNUC_UNUSED virLogSource virLogSelf = { \
.name = "" n "", \
.priority = VIR_LOG_ERROR, \
.serial = 0, \
diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c
index 9b25683963..43cefc1e8e 100644
--- a/src/util/virmacmap.c
+++ b/src/util/virmacmap.c
@@ -52,8 +52,8 @@ static virClassPtr virMacMapClass;
static int
virMacMapHashFree(void *payload,
- const void *name ATTRIBUTE_UNUSED,
- void *opaque ATTRIBUTE_UNUSED)
+ const void *name G_GNUC_UNUSED,
+ void *opaque G_GNUC_UNUSED)
{
virStringListFree(payload);
return 0;
diff --git a/src/util/virmdev.c b/src/util/virmdev.c
index 3d5488cdae..7700ae2ae8 100644
--- a/src/util/virmdev.c
+++ b/src/util/virmdev.c
@@ -173,8 +173,8 @@ virMediatedDeviceNew(const char *uuidstr, virMediatedDeviceModelType model)
#else
virMediatedDevicePtr
-virMediatedDeviceNew(const char *uuidstr ATTRIBUTE_UNUSED,
- virMediatedDeviceModelType model ATTRIBUTE_UNUSED)
+virMediatedDeviceNew(const char *uuidstr G_GNUC_UNUSED,
+ virMediatedDeviceModelType model G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("mediated devices are not supported on non-linux "
diff --git a/src/util/virmodule.c b/src/util/virmodule.c
index b0a019497c..da64fbd1c3 100644
--- a/src/util/virmodule.c
+++ b/src/util/virmodule.c
@@ -143,7 +143,7 @@ virModuleLoad(const char *path,
#else /* ! HAVE_DLFCN_H */
int
virModuleLoad(const char *path,
- const char *regfunc ATTRIBUTE_UNUSED,
+ const char *regfunc G_GNUC_UNUSED,
bool required)
{
VIR_DEBUG("dlopen not available on this platform");
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 5fef0b79aa..d3f1595ae4 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -175,8 +175,8 @@ virNetDevSetupControl(const char *ifname,
}
#else /* !HAVE_STRUCT_IFREQ */
int
-virNetDevSetupControl(const char *ifname ATTRIBUTE_UNUSED,
- void *ifr ATTRIBUTE_UNUSED)
+virNetDevSetupControl(const char *ifname G_GNUC_UNUSED,
+ void *ifr G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Network device configuration is not supported "
@@ -330,8 +330,8 @@ virNetDevSetMACInternal(const char *ifname,
static int
virNetDevSetMACInternal(const char *ifname,
- const virMacAddr *macaddr ATTRIBUTE_UNUSED,
- bool quiet ATTRIBUTE_UNUSED)
+ const virMacAddr *macaddr G_GNUC_UNUSED,
+ bool quiet G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS,
_("Cannot set interface MAC on '%s'"),
@@ -383,7 +383,7 @@ int virNetDevGetMAC(const char *ifname,
}
#else
int virNetDevGetMAC(const char *ifname,
- virMacAddrPtr macaddr ATTRIBUTE_UNUSED)
+ virMacAddrPtr macaddr G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS,
_("Cannot get interface MAC on '%s'"),
@@ -461,7 +461,7 @@ int virNetDevSetMTU(const char *ifname, int mtu)
return 0;
}
#else
-int virNetDevSetMTU(const char *ifname, int mtu ATTRIBUTE_UNUSED)
+int virNetDevSetMTU(const char *ifname, int mtu G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS,
_("Cannot set interface MTU on '%s'"),
@@ -637,8 +637,8 @@ virNetDevSetIFFlag(const char *ifname, int flag, bool val)
#else
static int
virNetDevSetIFFlag(const char *ifname,
- int flag ATTRIBUTE_UNUSED,
- bool val ATTRIBUTE_UNUSED)
+ int flag G_GNUC_UNUSED,
+ bool val G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS,
_("Cannot set interface flags on '%s'"),
@@ -743,8 +743,8 @@ virNetDevGetIFFlag(const char *ifname, int flag, bool *val)
#else
static int
virNetDevGetIFFlag(const char *ifname,
- int flag ATTRIBUTE_UNUSED,
- bool *val ATTRIBUTE_UNUSED)
+ int flag G_GNUC_UNUSED,
+ bool *val G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS,
_("Cannot get interface flags on '%s'"),
@@ -895,8 +895,8 @@ int virNetDevGetIndex(const char *ifname, int *ifindex)
return 0;
}
#else /* ! SIOCGIFINDEX */
-int virNetDevGetIndex(const char *ifname ATTRIBUTE_UNUSED,
- int *ifindex ATTRIBUTE_UNUSED)
+int virNetDevGetIndex(const char *ifname G_GNUC_UNUSED,
+ int *ifindex G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to get interface index on this platform"));
@@ -944,8 +944,8 @@ virNetDevGetMaster(const char *ifname, char **master)
int
-virNetDevGetMaster(const char *ifname ATTRIBUTE_UNUSED,
- char **master ATTRIBUTE_UNUSED)
+virNetDevGetMaster(const char *ifname G_GNUC_UNUSED,
+ char **master G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unable to get device master from netlink on this platform"));
@@ -987,8 +987,8 @@ int virNetDevGetVLanID(const char *ifname, int *vlanid)
return 0;
}
#else /* ! SIOCGIFVLAN */
-int virNetDevGetVLanID(const char *ifname ATTRIBUTE_UNUSED,
- int *vlanid ATTRIBUTE_UNUSED)
+int virNetDevGetVLanID(const char *ifname G_GNUC_UNUSED,
+ int *vlanid G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to get VLAN on this platform"));
@@ -1052,9 +1052,9 @@ int virNetDevValidateConfig(const char *ifname,
return 1;
}
#else
-int virNetDevValidateConfig(const char *ifname ATTRIBUTE_UNUSED,
- const virMacAddr *macaddr ATTRIBUTE_UNUSED,
- int ifindex ATTRIBUTE_UNUSED)
+int virNetDevValidateConfig(const char *ifname G_GNUC_UNUSED,
+ const virMacAddr *macaddr G_GNUC_UNUSED,
+ int ifindex G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to check interface config on this platform"));
@@ -1461,7 +1461,7 @@ virNetDevGetVirtualFunctionInfo(const char *vfname, char **pfname,
#else /* !__linux__ */
int
-virNetDevGetPhysPortID(const char *ifname ATTRIBUTE_UNUSED,
+virNetDevGetPhysPortID(const char *ifname G_GNUC_UNUSED,
char **physPortID)
{
/* this actually should never be called, and is just here to
@@ -1472,11 +1472,11 @@ virNetDevGetPhysPortID(const char *ifname ATTRIBUTE_UNUSED,
}
int
-virNetDevGetVirtualFunctions(const char *pfname ATTRIBUTE_UNUSED,
- char ***vfname ATTRIBUTE_UNUSED,
- virPCIDeviceAddressPtr **virt_fns ATTRIBUTE_UNUSED,
- size_t *n_vfname ATTRIBUTE_UNUSED,
- unsigned int *max_vfs ATTRIBUTE_UNUSED)
+virNetDevGetVirtualFunctions(const char *pfname G_GNUC_UNUSED,
+ char ***vfname G_GNUC_UNUSED,
+ virPCIDeviceAddressPtr **virt_fns G_GNUC_UNUSED,
+ size_t *n_vfname G_GNUC_UNUSED,
+ unsigned int *max_vfs G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to get virtual functions on this platform"));
@@ -1484,7 +1484,7 @@ virNetDevGetVirtualFunctions(const char *pfname ATTRIBUTE_UNUSED,
}
int
-virNetDevIsVirtualFunction(const char *ifname ATTRIBUTE_UNUSED)
+virNetDevIsVirtualFunction(const char *ifname G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to check virtual function status on this platform"));
@@ -1492,9 +1492,9 @@ virNetDevIsVirtualFunction(const char *ifname ATTRIBUTE_UNUSED)
}
int
-virNetDevGetVirtualFunctionIndex(const char *pfname ATTRIBUTE_UNUSED,
- const char *vfname ATTRIBUTE_UNUSED,
- int *vf_index ATTRIBUTE_UNUSED)
+virNetDevGetVirtualFunctionIndex(const char *pfname G_GNUC_UNUSED,
+ const char *vfname G_GNUC_UNUSED,
+ int *vf_index G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to get virtual function index on this platform"));
@@ -1502,8 +1502,8 @@ virNetDevGetVirtualFunctionIndex(const char *pfname ATTRIBUTE_UNUSED,
}
int
-virNetDevGetPhysicalFunction(const char *ifname ATTRIBUTE_UNUSED,
- char **pfname ATTRIBUTE_UNUSED)
+virNetDevGetPhysicalFunction(const char *ifname G_GNUC_UNUSED,
+ char **pfname G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to get physical function status on this platform"));
@@ -1511,9 +1511,9 @@ virNetDevGetPhysicalFunction(const char *ifname ATTRIBUTE_UNUSED,
}
int
-virNetDevPFGetVF(const char *pfname ATTRIBUTE_UNUSED,
- int vf ATTRIBUTE_UNUSED,
- char **vfname ATTRIBUTE_UNUSED)
+virNetDevPFGetVF(const char *pfname G_GNUC_UNUSED,
+ int vf G_GNUC_UNUSED,
+ char **vfname G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to get virtual function name on this platform"));
@@ -1521,9 +1521,9 @@ virNetDevPFGetVF(const char *pfname ATTRIBUTE_UNUSED,
}
int
-virNetDevGetVirtualFunctionInfo(const char *vfname ATTRIBUTE_UNUSED,
- char **pfname ATTRIBUTE_UNUSED,
- int *vf ATTRIBUTE_UNUSED)
+virNetDevGetVirtualFunctionInfo(const char *vfname G_GNUC_UNUSED,
+ char **pfname G_GNUC_UNUSED,
+ int *vf G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to get virtual function info on this platform"));
@@ -1531,9 +1531,9 @@ virNetDevGetVirtualFunctionInfo(const char *vfname ATTRIBUTE_UNUSED,
}
int
-virNetDevSysfsFile(char **pf_sysfs_device_link ATTRIBUTE_UNUSED,
- const char *ifname ATTRIBUTE_UNUSED,
- const char *file ATTRIBUTE_UNUSED)
+virNetDevSysfsFile(char **pf_sysfs_device_link G_GNUC_UNUSED,
+ const char *ifname G_GNUC_UNUSED,
+ const char *file G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to get sysfs info on this platform"));
@@ -2372,10 +2372,10 @@ virNetDevSetNetConfig(const char *linkdev, int vf,
int
-virNetDevSaveNetConfig(const char *linkdev ATTRIBUTE_UNUSED,
- int vf ATTRIBUTE_UNUSED,
- const char *stateDir ATTRIBUTE_UNUSED,
- bool saveVlan ATTRIBUTE_UNUSED)
+virNetDevSaveNetConfig(const char *linkdev G_GNUC_UNUSED,
+ int vf G_GNUC_UNUSED,
+ const char *stateDir G_GNUC_UNUSED,
+ bool saveVlan G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to save net device config on this platform"));
@@ -2384,12 +2384,12 @@ virNetDevSaveNetConfig(const char *linkdev ATTRIBUTE_UNUSED,
int
-virNetDevReadNetConfig(const char *linkdev ATTRIBUTE_UNUSED,
- int vf ATTRIBUTE_UNUSED,
- const char *stateDir ATTRIBUTE_UNUSED,
- virMacAddrPtr *adminMAC ATTRIBUTE_UNUSED,
- virNetDevVlanPtr *vlan ATTRIBUTE_UNUSED,
- virMacAddrPtr *MAC ATTRIBUTE_UNUSED)
+virNetDevReadNetConfig(const char *linkdev G_GNUC_UNUSED,
+ int vf G_GNUC_UNUSED,
+ const char *stateDir G_GNUC_UNUSED,
+ virMacAddrPtr *adminMAC G_GNUC_UNUSED,
+ virNetDevVlanPtr *vlan G_GNUC_UNUSED,
+ virMacAddrPtr *MAC G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to read net device config on this platform"));
@@ -2398,12 +2398,12 @@ virNetDevReadNetConfig(const char *linkdev ATTRIBUTE_UNUSED,
int
-virNetDevSetNetConfig(const char *linkdev ATTRIBUTE_UNUSED,
- int vf ATTRIBUTE_UNUSED,
- const virMacAddr *adminMAC ATTRIBUTE_UNUSED,
- virNetDevVlanPtr vlan ATTRIBUTE_UNUSED,
- const virMacAddr *MAC ATTRIBUTE_UNUSED,
- bool setVlan ATTRIBUTE_UNUSED)
+virNetDevSetNetConfig(const char *linkdev G_GNUC_UNUSED,
+ int vf G_GNUC_UNUSED,
+ const virMacAddr *adminMAC G_GNUC_UNUSED,
+ virNetDevVlanPtr vlan G_GNUC_UNUSED,
+ const virMacAddr *MAC G_GNUC_UNUSED,
+ bool setVlan G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to set net device config on this platform"));
@@ -2576,8 +2576,8 @@ int virNetDevAddMulti(const char *ifname,
return 0;
}
#else
-int virNetDevAddMulti(const char *ifname ATTRIBUTE_UNUSED,
- virMacAddrPtr macaddr ATTRIBUTE_UNUSED)
+int virNetDevAddMulti(const char *ifname G_GNUC_UNUSED,
+ virMacAddrPtr macaddr G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to add address to interface "
@@ -2621,8 +2621,8 @@ int virNetDevDelMulti(const char *ifname,
return 0;
}
#else
-int virNetDevDelMulti(const char *ifname ATTRIBUTE_UNUSED,
- virMacAddrPtr macaddr ATTRIBUTE_UNUSED)
+int virNetDevDelMulti(const char *ifname G_GNUC_UNUSED,
+ virMacAddrPtr macaddr G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to delete address from interface "
@@ -3222,8 +3222,8 @@ virNetDevSwitchdevFeature(const char *ifname,
}
# else
static int
-virNetDevSwitchdevFeature(const char *ifname ATTRIBUTE_UNUSED,
- virBitmapPtr *out ATTRIBUTE_UNUSED)
+virNetDevSwitchdevFeature(const char *ifname G_GNUC_UNUSED,
+ virBitmapPtr *out G_GNUC_UNUSED)
{
return 0;
}
@@ -3273,9 +3273,9 @@ virNetDevGetEthtoolGFeatures(virBitmapPtr bitmap,
}
# else
static int
-virNetDevGetEthtoolGFeatures(virBitmapPtr bitmap ATTRIBUTE_UNUSED,
- int fd ATTRIBUTE_UNUSED,
- struct ifreq *ifr ATTRIBUTE_UNUSED)
+virNetDevGetEthtoolGFeatures(virBitmapPtr bitmap G_GNUC_UNUSED,
+ int fd G_GNUC_UNUSED,
+ struct ifreq *ifr G_GNUC_UNUSED)
{
return 0;
}
@@ -3432,8 +3432,8 @@ virNetDevGetFeatures(const char *ifname,
}
#else
int
-virNetDevGetFeatures(const char *ifname ATTRIBUTE_UNUSED,
- virBitmapPtr *out ATTRIBUTE_UNUSED)
+virNetDevGetFeatures(const char *ifname G_GNUC_UNUSED,
+ virBitmapPtr *out G_GNUC_UNUSED)
{
VIR_DEBUG("Getting network device features on %s is not implemented on this platform",
ifname);
diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index 4f21a82fb7..50e90e2792 100644
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -325,9 +325,9 @@ virNetDevBridgePortSetUnicastFlood(const char *brname,
#else
int
-virNetDevBridgePortGetLearning(const char *brname ATTRIBUTE_UNUSED,
- const char *ifname ATTRIBUTE_UNUSED,
- bool *enable ATTRIBUTE_UNUSED)
+virNetDevBridgePortGetLearning(const char *brname G_GNUC_UNUSED,
+ const char *ifname G_GNUC_UNUSED,
+ bool *enable G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to get bridge port learning on this platform"));
@@ -336,9 +336,9 @@ virNetDevBridgePortGetLearning(const char *brname ATTRIBUTE_UNUSED,
int
-virNetDevBridgePortSetLearning(const char *brname ATTRIBUTE_UNUSED,
- const char *ifname ATTRIBUTE_UNUSED,
- bool enable ATTRIBUTE_UNUSED)
+virNetDevBridgePortSetLearning(const char *brname G_GNUC_UNUSED,
+ const char *ifname G_GNUC_UNUSED,
+ bool enable G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to set bridge port learning on this platform"));
@@ -347,9 +347,9 @@ virNetDevBridgePortSetLearning(const char *brname ATTRIBUTE_UNUSED,
int
-virNetDevBridgePortGetUnicastFlood(const char *brname ATTRIBUTE_UNUSED,
- const char *ifname ATTRIBUTE_UNUSED,
- bool *enable ATTRIBUTE_UNUSED)
+virNetDevBridgePortGetUnicastFlood(const char *brname G_GNUC_UNUSED,
+ const char *ifname G_GNUC_UNUSED,
+ bool *enable G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to get bridge port unicast_flood on this platform"));
@@ -358,9 +358,9 @@ virNetDevBridgePortGetUnicastFlood(const char *brname ATTRIBUTE_UNUSED,
int
-virNetDevBridgePortSetUnicastFlood(const char *brname ATTRIBUTE_UNUSED,
- const char *ifname ATTRIBUTE_UNUSED,
- bool enable ATTRIBUTE_UNUSED)
+virNetDevBridgePortSetUnicastFlood(const char *brname G_GNUC_UNUSED,
+ const char *ifname G_GNUC_UNUSED,
+ bool enable G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to set bridge port unicast_flood on this platform"));
@@ -533,7 +533,7 @@ virNetDevBridgeDelete(const char *brname)
return 0;
}
#else
-int virNetDevBridgeDelete(const char *brname ATTRIBUTE_UNUSED)
+int virNetDevBridgeDelete(const char *brname G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS,
_("Unable to delete bridge %s"), brname);
@@ -787,7 +787,7 @@ int virNetDevBridgeSetSTPDelay(const char *brname,
return 0;
}
int virNetDevBridgeGetSTPDelay(const char *brname,
- int *delay ATTRIBUTE_UNUSED)
+ int *delay G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS,
_("Unable to get STP delay on %s on this platform"),
@@ -795,8 +795,8 @@ int virNetDevBridgeGetSTPDelay(const char *brname,
return -1;
}
-int virNetDevBridgeSetSTP(const char *brname ATTRIBUTE_UNUSED,
- bool enable ATTRIBUTE_UNUSED)
+int virNetDevBridgeSetSTP(const char *brname G_GNUC_UNUSED,
+ bool enable G_GNUC_UNUSED)
{
/* FreeBSD doesn't allow to set STP per bridge,
@@ -804,7 +804,7 @@ int virNetDevBridgeSetSTP(const char *brname ATTRIBUTE_UNUSED,
return 0;
}
int virNetDevBridgeGetSTP(const char *brname,
- bool *enable ATTRIBUTE_UNUSED)
+ bool *enable G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS,
_("Unable to get STP on %s on this platform"),
@@ -813,7 +813,7 @@ int virNetDevBridgeGetSTP(const char *brname,
}
#else
int virNetDevBridgeSetSTPDelay(const char *brname,
- int delay ATTRIBUTE_UNUSED)
+ int delay G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS,
_("Unable to set STP delay on %s on this platform"),
@@ -821,7 +821,7 @@ int virNetDevBridgeSetSTPDelay(const char *brname,
return -1;
}
int virNetDevBridgeGetSTPDelay(const char *brname,
- int *delay ATTRIBUTE_UNUSED)
+ int *delay G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS,
_("Unable to get STP delay on %s on this platform"),
@@ -830,7 +830,7 @@ int virNetDevBridgeGetSTPDelay(const char *brname,
}
int virNetDevBridgeSetSTP(const char *brname,
- bool enable ATTRIBUTE_UNUSED)
+ bool enable G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS,
@@ -839,7 +839,7 @@ int virNetDevBridgeSetSTP(const char *brname,
return -1;
}
int virNetDevBridgeGetSTP(const char *brname,
- bool *enable ATTRIBUTE_UNUSED)
+ bool *enable G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS,
_("Unable to get STP on %s on this platform"),
@@ -896,8 +896,8 @@ virNetDevBridgeSetVlanFiltering(const char *brname,
#else
int
-virNetDevBridgeGetVlanFiltering(const char *brname ATTRIBUTE_UNUSED,
- bool *enable ATTRIBUTE_UNUSED)
+virNetDevBridgeGetVlanFiltering(const char *brname G_GNUC_UNUSED,
+ bool *enable G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to get bridge vlan_filtering on this platform"));
@@ -906,8 +906,8 @@ virNetDevBridgeGetVlanFiltering(const char *brname ATTRIBUTE_UNUSED,
int
-virNetDevBridgeSetVlanFiltering(const char *brname ATTRIBUTE_UNUSED,
- bool enable ATTRIBUTE_UNUSED)
+virNetDevBridgeSetVlanFiltering(const char *brname G_GNUC_UNUSED,
+ bool enable G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to set bridge vlan_filtering on this platform"));
@@ -1035,10 +1035,10 @@ virNetDevBridgeFDBAddDel(const virMacAddr *mac, const char *ifname,
#else
static int
-virNetDevBridgeFDBAddDel(const virMacAddr *mac ATTRIBUTE_UNUSED,
- const char *ifname ATTRIBUTE_UNUSED,
- unsigned int fdbFlags ATTRIBUTE_UNUSED,
- bool isAdd ATTRIBUTE_UNUSED)
+virNetDevBridgeFDBAddDel(const virMacAddr *mac G_GNUC_UNUSED,
+ const char *ifname G_GNUC_UNUSED,
+ unsigned int fdbFlags G_GNUC_UNUSED,
+ bool isAdd G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to add/delete fdb entries on this platform"));
diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c
index e9d1ce0831..dea3de6514 100644
--- a/src/util/virnetdevip.c
+++ b/src/util/virnetdevip.c
@@ -802,8 +802,8 @@ virNetDevIPRouteAdd(const char *ifname,
/* return after DAD finishes for all known IPv6 addresses or an error */
int
-virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs ATTRIBUTE_UNUSED,
- size_t count ATTRIBUTE_UNUSED)
+virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs G_GNUC_UNUSED,
+ size_t count G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to wait for IPv6 DAD on this platform"));
@@ -862,8 +862,8 @@ virNetDevGetIPv4AddressIoctl(const char *ifname,
#else /* ! SIOCGIFADDR */
static int
-virNetDevGetIPv4AddressIoctl(const char *ifname ATTRIBUTE_UNUSED,
- virSocketAddrPtr addr ATTRIBUTE_UNUSED)
+virNetDevGetIPv4AddressIoctl(const char *ifname G_GNUC_UNUSED,
+ virSocketAddrPtr addr G_GNUC_UNUSED)
{
return -2;
}
@@ -931,8 +931,8 @@ virNetDevGetifaddrsAddress(const char *ifname,
#else /* ! HAVE_GETIFADDRS */
static int
-virNetDevGetifaddrsAddress(const char *ifname ATTRIBUTE_UNUSED,
- virSocketAddrPtr addr ATTRIBUTE_UNUSED)
+virNetDevGetifaddrsAddress(const char *ifname G_GNUC_UNUSED,
+ virSocketAddrPtr addr G_GNUC_UNUSED)
{
return -2;
}
diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index efd81c3aa0..1ee503afb6 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -816,8 +816,8 @@ virNetlinkCallbackDataFree(virNetlinkCallbackDataPtr calld)
* data, and the opaque object itself.
*/
static void
-virNetDevMacVLanVPortProfileDestroyCallback(int watch ATTRIBUTE_UNUSED,
- const virMacAddr *macaddr ATTRIBUTE_UNUSED,
+virNetDevMacVLanVPortProfileDestroyCallback(int watch G_GNUC_UNUSED,
+ const virMacAddr *macaddr G_GNUC_UNUSED,
void *opaque)
{
virNetlinkCallbackDataFree((virNetlinkCallbackDataPtr)opaque);
@@ -1178,26 +1178,26 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname,
}
#else /* ! WITH_MACVTAP */
-bool virNetDevMacVLanIsMacvtap(const char *ifname ATTRIBUTE_UNUSED)
+bool virNetDevMacVLanIsMacvtap(const char *ifname G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Cannot create macvlan devices on this platform"));
return false;
}
-int virNetDevMacVLanCreate(const char *ifname ATTRIBUTE_UNUSED,
- const char *type ATTRIBUTE_UNUSED,
- const virMacAddr *macaddress ATTRIBUTE_UNUSED,
- const char *srcdev ATTRIBUTE_UNUSED,
- uint32_t macvlan_mode ATTRIBUTE_UNUSED,
- int *retry ATTRIBUTE_UNUSED)
+int virNetDevMacVLanCreate(const char *ifname G_GNUC_UNUSED,
+ const char *type G_GNUC_UNUSED,
+ const virMacAddr *macaddress G_GNUC_UNUSED,
+ const char *srcdev G_GNUC_UNUSED,
+ uint32_t macvlan_mode G_GNUC_UNUSED,
+ int *retry G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Cannot create macvlan devices on this platform"));
return -1;
}
-int virNetDevMacVLanDelete(const char *ifname ATTRIBUTE_UNUSED)
+int virNetDevMacVLanDelete(const char *ifname G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Cannot create macvlan devices on this platform"));
@@ -1205,9 +1205,9 @@ int virNetDevMacVLanDelete(const char *ifname ATTRIBUTE_UNUSED)
}
int
-virNetDevMacVLanTapOpen(const char *ifname ATTRIBUTE_UNUSED,
- int *tapfd ATTRIBUTE_UNUSED,
- size_t tapfdSize ATTRIBUTE_UNUSED)
+virNetDevMacVLanTapOpen(const char *ifname G_GNUC_UNUSED,
+ int *tapfd G_GNUC_UNUSED,
+ size_t tapfdSize G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Cannot create macvlan devices on this platform"));
@@ -1215,79 +1215,79 @@ virNetDevMacVLanTapOpen(const char *ifname ATTRIBUTE_UNUSED,
}
int
-virNetDevMacVLanTapSetup(int *tapfd ATTRIBUTE_UNUSED,
- size_t tapfdSize ATTRIBUTE_UNUSED,
- bool vnet_hdr ATTRIBUTE_UNUSED)
+virNetDevMacVLanTapSetup(int *tapfd G_GNUC_UNUSED,
+ size_t tapfdSize G_GNUC_UNUSED,
+ bool vnet_hdr G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Cannot create macvlan devices on this platform"));
return -1;
}
-int virNetDevMacVLanCreateWithVPortProfile(const char *ifname ATTRIBUTE_UNUSED,
- const virMacAddr *macaddress ATTRIBUTE_UNUSED,
- const char *linkdev ATTRIBUTE_UNUSED,
- virNetDevMacVLanMode mode ATTRIBUTE_UNUSED,
- virNetDevVlanPtr vlan ATTRIBUTE_UNUSED,
- const unsigned char *vmuuid ATTRIBUTE_UNUSED,
- virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED,
- char **res_ifname ATTRIBUTE_UNUSED,
- virNetDevVPortProfileOp vmop ATTRIBUTE_UNUSED,
- char *stateDir ATTRIBUTE_UNUSED,
- int *tapfd ATTRIBUTE_UNUSED,
- size_t tapfdSize ATTRIBUTE_UNUSED,
- unsigned int unused_flags ATTRIBUTE_UNUSED)
+int virNetDevMacVLanCreateWithVPortProfile(const char *ifname G_GNUC_UNUSED,
+ const virMacAddr *macaddress G_GNUC_UNUSED,
+ const char *linkdev G_GNUC_UNUSED,
+ virNetDevMacVLanMode mode G_GNUC_UNUSED,
+ virNetDevVlanPtr vlan G_GNUC_UNUSED,
+ const unsigned char *vmuuid G_GNUC_UNUSED,
+ virNetDevVPortProfilePtr virtPortProfile G_GNUC_UNUSED,
+ char **res_ifname G_GNUC_UNUSED,
+ virNetDevVPortProfileOp vmop G_GNUC_UNUSED,
+ char *stateDir G_GNUC_UNUSED,
+ int *tapfd G_GNUC_UNUSED,
+ size_t tapfdSize G_GNUC_UNUSED,
+ unsigned int unused_flags G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Cannot create macvlan devices on this platform"));
return -1;
}
-int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname ATTRIBUTE_UNUSED,
- const virMacAddr *macaddress ATTRIBUTE_UNUSED,
- const char *linkdev ATTRIBUTE_UNUSED,
- int mode ATTRIBUTE_UNUSED,
- virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED,
- char *stateDir ATTRIBUTE_UNUSED)
+int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname G_GNUC_UNUSED,
+ const virMacAddr *macaddress G_GNUC_UNUSED,
+ const char *linkdev G_GNUC_UNUSED,
+ int mode G_GNUC_UNUSED,
+ virNetDevVPortProfilePtr virtPortProfile G_GNUC_UNUSED,
+ char *stateDir G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Cannot create macvlan devices on this platform"));
return -1;
}
-int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname ATTRIBUTE_UNUSED,
- const virMacAddr *macaddress ATTRIBUTE_UNUSED,
- const char *linkdev ATTRIBUTE_UNUSED,
- const unsigned char *vmuuid ATTRIBUTE_UNUSED,
- virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED,
- virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED)
+int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname G_GNUC_UNUSED,
+ const virMacAddr *macaddress G_GNUC_UNUSED,
+ const char *linkdev G_GNUC_UNUSED,
+ const unsigned char *vmuuid G_GNUC_UNUSED,
+ virNetDevVPortProfilePtr virtPortProfile G_GNUC_UNUSED,
+ virNetDevVPortProfileOp vmOp G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Cannot create macvlan devices on this platform"));
return -1;
}
-int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname ATTRIBUTE_UNUSED,
- const virMacAddr *macaddress ATTRIBUTE_UNUSED,
- const char *linkdev ATTRIBUTE_UNUSED,
- const unsigned char *vmuuid ATTRIBUTE_UNUSED,
- virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED,
- virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED)
+int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname G_GNUC_UNUSED,
+ const virMacAddr *macaddress G_GNUC_UNUSED,
+ const char *linkdev G_GNUC_UNUSED,
+ const unsigned char *vmuuid G_GNUC_UNUSED,
+ virNetDevVPortProfilePtr virtPortProfile G_GNUC_UNUSED,
+ virNetDevVPortProfileOp vmOp G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Cannot create macvlan devices on this platform"));
return -1;
}
-int virNetDevMacVLanReleaseName(const char *name ATTRIBUTE_UNUSED)
+int virNetDevMacVLanReleaseName(const char *name G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Cannot create macvlan devices on this platform"));
return -1;
}
-int virNetDevMacVLanReserveName(const char *name ATTRIBUTE_UNUSED,
- bool quietFail ATTRIBUTE_UNUSED)
+int virNetDevMacVLanReserveName(const char *name G_GNUC_UNUSED,
+ bool quietFail G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Cannot create macvlan devices on this platform"));
diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index 2afc30f485..3066ef9cde 100644
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -211,7 +211,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
*
* Returns 0 in case of success or -1 in case of failure.
*/
-int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const char *ifname)
+int virNetDevOpenvswitchRemovePort(const char *brname G_GNUC_UNUSED, const char *ifname)
{
VIR_AUTOPTR(virCommand) cmd = NULL;
diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c
index 4548b51b5b..c2d7040938 100644
--- a/src/util/virnetdevtap.c
+++ b/src/util/virnetdevtap.c
@@ -62,7 +62,7 @@ VIR_LOG_INIT("util.netdevtap");
* Returns 0 if the interface name is successfully queried, -1 otherwise
*/
int
-virNetDevTapGetName(int tapfd ATTRIBUTE_UNUSED, char **ifname ATTRIBUTE_UNUSED)
+virNetDevTapGetName(int tapfd G_GNUC_UNUSED, char **ifname G_GNUC_UNUSED)
{
#ifdef TUNGETIFF
struct ifreq ifr;
@@ -92,7 +92,7 @@ virNetDevTapGetName(int tapfd ATTRIBUTE_UNUSED, char **ifname ATTRIBUTE_UNUSED)
* found.
*/
char*
-virNetDevTapGetRealDeviceName(char *ifname ATTRIBUTE_UNUSED)
+virNetDevTapGetRealDeviceName(char *ifname G_GNUC_UNUSED)
{
#ifdef IFDATA_DRIVERNAME
int ifindex = 0;
@@ -356,10 +356,10 @@ int virNetDevTapDelete(const char *ifname,
}
#elif defined(SIOCIFCREATE2) && defined(SIOCIFDESTROY) && defined(IF_MAXUNIT)
int virNetDevTapCreate(char **ifname,
- const char *tunpath ATTRIBUTE_UNUSED,
+ const char *tunpath G_GNUC_UNUSED,
int *tapfd,
size_t tapfdSize,
- unsigned int flags ATTRIBUTE_UNUSED)
+ unsigned int flags G_GNUC_UNUSED)
{
int s;
struct ifreq ifr;
@@ -439,7 +439,7 @@ int virNetDevTapCreate(char **ifname,
}
int virNetDevTapDelete(const char *ifname,
- const char *tunpath ATTRIBUTE_UNUSED)
+ const char *tunpath G_GNUC_UNUSED)
{
int s;
struct ifreq ifr;
@@ -462,18 +462,18 @@ int virNetDevTapDelete(const char *ifname,
}
#else
-int virNetDevTapCreate(char **ifname ATTRIBUTE_UNUSED,
- const char *tunpath ATTRIBUTE_UNUSED,
- int *tapfd ATTRIBUTE_UNUSED,
- size_t tapfdSize ATTRIBUTE_UNUSED,
- unsigned int flags ATTRIBUTE_UNUSED)
+int virNetDevTapCreate(char **ifname G_GNUC_UNUSED,
+ const char *tunpath G_GNUC_UNUSED,
+ int *tapfd G_GNUC_UNUSED,
+ size_t tapfdSize G_GNUC_UNUSED,
+ unsigned int flags G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to create TAP devices on this platform"));
return -1;
}
-int virNetDevTapDelete(const char *ifname ATTRIBUTE_UNUSED,
- const char *tunpath ATTRIBUTE_UNUSED)
+int virNetDevTapDelete(const char *ifname G_GNUC_UNUSED,
+ const char *tunpath G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to delete TAP devices on this platform"));
@@ -891,9 +891,9 @@ virNetDevTapInterfaceStats(const char *ifname,
}
#else
int
-virNetDevTapInterfaceStats(const char *ifname ATTRIBUTE_UNUSED,
- virDomainInterfaceStatsPtr stats ATTRIBUTE_UNUSED,
- bool swapped ATTRIBUTE_UNUSED)
+virNetDevTapInterfaceStats(const char *ifname G_GNUC_UNUSED,
+ virDomainInterfaceStatsPtr stats G_GNUC_UNUSED,
+ bool swapped G_GNUC_UNUSED)
{
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("interface stats not implemented on this platform"));
diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index 048f891920..b001aea3ec 100644
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -1359,26 +1359,26 @@ virNetDevVPortProfileDisassociate(const char *macvtap_ifname,
}
#else /* ! WITH_VIRTUALPORT */
-int virNetDevVPortProfileAssociate(const char *macvtap_ifname ATTRIBUTE_UNUSED,
- const virNetDevVPortProfile *virtPort ATTRIBUTE_UNUSED,
- const virMacAddr *macvtap_macaddr ATTRIBUTE_UNUSED,
- const char *linkdev ATTRIBUTE_UNUSED,
- int vf ATTRIBUTE_UNUSED,
- const unsigned char *vmuuid ATTRIBUTE_UNUSED,
- virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED,
- bool setlink_only ATTRIBUTE_UNUSED)
+int virNetDevVPortProfileAssociate(const char *macvtap_ifname G_GNUC_UNUSED,
+ const virNetDevVPortProfile *virtPort G_GNUC_UNUSED,
+ const virMacAddr *macvtap_macaddr G_GNUC_UNUSED,
+ const char *linkdev G_GNUC_UNUSED,
+ int vf G_GNUC_UNUSED,
+ const unsigned char *vmuuid G_GNUC_UNUSED,
+ virNetDevVPortProfileOp vmOp G_GNUC_UNUSED,
+ bool setlink_only G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Virtual port profile association not supported on this platform"));
return -1;
}
-int virNetDevVPortProfileDisassociate(const char *macvtap_ifname ATTRIBUTE_UNUSED,
- const virNetDevVPortProfile *virtPort ATTRIBUTE_UNUSED,
- const virMacAddr *macvtap_macaddr ATTRIBUTE_UNUSED,
- const char *linkdev ATTRIBUTE_UNUSED,
- int vf ATTRIBUTE_UNUSED,
- virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED)
+int virNetDevVPortProfileDisassociate(const char *macvtap_ifname G_GNUC_UNUSED,
+ const virNetDevVPortProfile *virtPort G_GNUC_UNUSED,
+ const virMacAddr *macvtap_macaddr G_GNUC_UNUSED,
+ const char *linkdev G_GNUC_UNUSED,
+ int vf G_GNUC_UNUSED,
+ virNetDevVPortProfileOp vmOp G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Virtual port profile association not supported on this platform"));
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index 7b3c6bf05f..0b1f3262f4 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -838,8 +838,8 @@ virNetlinkEventRemoveClientPrimitive(size_t i, unsigned int protocol)
static void
virNetlinkEventCallback(int watch,
- int fd ATTRIBUTE_UNUSED,
- int events ATTRIBUTE_UNUSED,
+ int fd G_GNUC_UNUSED,
+ int events G_GNUC_UNUSED,
void *opaque)
{
virNetlinkEventSrvPrivatePtr srv = opaque;
@@ -1238,38 +1238,38 @@ virNetlinkShutdown(void)
return;
}
-int virNetlinkCommand(struct nl_msg *nl_msg ATTRIBUTE_UNUSED,
- struct nlmsghdr **resp ATTRIBUTE_UNUSED,
- unsigned int *respbuflen ATTRIBUTE_UNUSED,
- uint32_t src_pid ATTRIBUTE_UNUSED,
- uint32_t dst_pid ATTRIBUTE_UNUSED,
- unsigned int protocol ATTRIBUTE_UNUSED,
- unsigned int groups ATTRIBUTE_UNUSED)
+int virNetlinkCommand(struct nl_msg *nl_msg G_GNUC_UNUSED,
+ struct nlmsghdr **resp G_GNUC_UNUSED,
+ unsigned int *respbuflen G_GNUC_UNUSED,
+ uint32_t src_pid G_GNUC_UNUSED,
+ uint32_t dst_pid G_GNUC_UNUSED,
+ unsigned int protocol G_GNUC_UNUSED,
+ unsigned int groups G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;
}
int
-virNetlinkDumpCommand(struct nl_msg *nl_msg ATTRIBUTE_UNUSED,
- virNetlinkDumpCallback callback ATTRIBUTE_UNUSED,
- uint32_t src_pid ATTRIBUTE_UNUSED,
- uint32_t dst_pid ATTRIBUTE_UNUSED,
- unsigned int protocol ATTRIBUTE_UNUSED,
- unsigned int groups ATTRIBUTE_UNUSED,
- void *opaque ATTRIBUTE_UNUSED)
+virNetlinkDumpCommand(struct nl_msg *nl_msg G_GNUC_UNUSED,
+ virNetlinkDumpCallback callback G_GNUC_UNUSED,
+ uint32_t src_pid G_GNUC_UNUSED,
+ uint32_t dst_pid G_GNUC_UNUSED,
+ unsigned int protocol G_GNUC_UNUSED,
+ unsigned int groups G_GNUC_UNUSED,
+ void *opaque G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;
}
int
-virNetlinkDumpLink(const char *ifname ATTRIBUTE_UNUSED,
- int ifindex ATTRIBUTE_UNUSED,
- void **nlData ATTRIBUTE_UNUSED,
- struct nlattr **tb ATTRIBUTE_UNUSED,
- uint32_t src_pid ATTRIBUTE_UNUSED,
- uint32_t dst_pid ATTRIBUTE_UNUSED)
+virNetlinkDumpLink(const char *ifname G_GNUC_UNUSED,
+ int ifindex G_GNUC_UNUSED,
+ void **nlData G_GNUC_UNUSED,
+ struct nlattr **tb G_GNUC_UNUSED,
+ uint32_t src_pid G_GNUC_UNUSED,
+ uint32_t dst_pid G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to dump link info on this platform"));
@@ -1278,8 +1278,8 @@ virNetlinkDumpLink(const char *ifname ATTRIBUTE_UNUSED,
int
-virNetlinkDelLink(const char *ifname ATTRIBUTE_UNUSED,
- virNetlinkDelLinkFallback fallback ATTRIBUTE_UNUSED)
+virNetlinkDelLink(const char *ifname G_GNUC_UNUSED,
+ virNetlinkDelLinkFallback fallback G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;
@@ -1287,10 +1287,10 @@ virNetlinkDelLink(const char *ifname ATTRIBUTE_UNUSED,
int
-virNetlinkNewLink(const char *ifname ATTRIBUTE_UNUSED,
- const char *type ATTRIBUTE_UNUSED,
- virNetlinkNewLinkDataPtr extra_args ATTRIBUTE_UNUSED,
- int *error ATTRIBUTE_UNUSED)
+virNetlinkNewLink(const char *ifname G_GNUC_UNUSED,
+ const char *type G_GNUC_UNUSED,
+ virNetlinkNewLinkDataPtr extra_args G_GNUC_UNUSED,
+ int *error G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;
@@ -1298,9 +1298,9 @@ virNetlinkNewLink(const char *ifname ATTRIBUTE_UNUSED,
int
-virNetlinkGetNeighbor(void **nlData ATTRIBUTE_UNUSED,
- uint32_t src_pid ATTRIBUTE_UNUSED,
- uint32_t dst_pid ATTRIBUTE_UNUSED)
+virNetlinkGetNeighbor(void **nlData G_GNUC_UNUSED,
+ uint32_t src_pid G_GNUC_UNUSED,
+ uint32_t dst_pid G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;
@@ -1311,7 +1311,7 @@ virNetlinkGetNeighbor(void **nlData ATTRIBUTE_UNUSED,
* stopNetlinkEventServer: stop the monitor to receive netlink
* messages for libvirtd
*/
-int virNetlinkEventServiceStop(unsigned int protocol ATTRIBUTE_UNUSED)
+int virNetlinkEventServiceStop(unsigned int protocol G_GNUC_UNUSED)
{
VIR_DEBUG("%s", _(unsupported));
return 0;
@@ -1331,8 +1331,8 @@ int virNetlinkEventServiceStopAll(void)
* startNetlinkEventServer: start a monitor to receive netlink
* messages for libvirtd
*/
-int virNetlinkEventServiceStart(unsigned int protocol ATTRIBUTE_UNUSED,
- unsigned int groups ATTRIBUTE_UNUSED)
+int virNetlinkEventServiceStart(unsigned int protocol G_GNUC_UNUSED,
+ unsigned int groups G_GNUC_UNUSED)
{
VIR_DEBUG("%s", _(unsupported));
return 0;
@@ -1342,13 +1342,13 @@ int virNetlinkEventServiceStart(unsigned int protocol ATTRIBUTE_UNUSED,
* virNetlinkEventServiceIsRunning: returns if the netlink event
* service is running.
*/
-bool virNetlinkEventServiceIsRunning(unsigned int protocol ATTRIBUTE_UNUSED)
+bool virNetlinkEventServiceIsRunning(unsigned int protocol G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return 0;
}
-int virNetlinkEventServiceLocalPid(unsigned int protocol ATTRIBUTE_UNUSED)
+int virNetlinkEventServiceLocalPid(unsigned int protocol G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;
@@ -1358,11 +1358,11 @@ int virNetlinkEventServiceLocalPid(unsigned int protocol ATTRIBUTE_UNUSED)
* virNetlinkEventAddClient: register a callback for handling of
* netlink messages
*/
-int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB ATTRIBUTE_UNUSED,
- virNetlinkEventRemoveCallback removeCB ATTRIBUTE_UNUSED,
- void *opaque ATTRIBUTE_UNUSED,
- const virMacAddr *macaddr ATTRIBUTE_UNUSED,
- unsigned int protocol ATTRIBUTE_UNUSED)
+int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB G_GNUC_UNUSED,
+ virNetlinkEventRemoveCallback removeCB G_GNUC_UNUSED,
+ void *opaque G_GNUC_UNUSED,
+ const virMacAddr *macaddr G_GNUC_UNUSED,
+ unsigned int protocol G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;
@@ -1371,9 +1371,9 @@ int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB ATTRIBUTE_UN
/**
* virNetlinkEventRemoveClient: unregister a callback from a netlink monitor
*/
-int virNetlinkEventRemoveClient(int watch ATTRIBUTE_UNUSED,
- const virMacAddr *macaddr ATTRIBUTE_UNUSED,
- unsigned int protocol ATTRIBUTE_UNUSED)
+int virNetlinkEventRemoveClient(int watch G_GNUC_UNUSED,
+ const virMacAddr *macaddr G_GNUC_UNUSED,
+ unsigned int protocol G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;
@@ -1381,8 +1381,8 @@ int virNetlinkEventRemoveClient(int watch ATTRIBUTE_UNUSED,
int
-virNetlinkGetErrorCode(struct nlmsghdr *resp ATTRIBUTE_UNUSED,
- unsigned int recvbuflen ATTRIBUTE_UNUSED)
+virNetlinkGetErrorCode(struct nlmsghdr *resp G_GNUC_UNUSED,
+ unsigned int recvbuflen G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -EINVAL;
diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c
index 93b0685ca6..9ce3566ecf 100644
--- a/src/util/virnodesuspend.c
+++ b/src/util/virnodesuspend.c
@@ -276,8 +276,8 @@ virNodeSuspendSupportsTargetPMUtils(unsigned int target, bool *supported)
}
#else /* ! WITH_PM_UTILS */
static int
-virNodeSuspendSupportsTargetPMUtils(unsigned int target ATTRIBUTE_UNUSED,
- bool *supported ATTRIBUTE_UNUSED)
+virNodeSuspendSupportsTargetPMUtils(unsigned int target G_GNUC_UNUSED,
+ bool *supported G_GNUC_UNUSED)
{
return -2;
}
diff --git a/src/util/virnuma.c b/src/util/virnuma.c
index 34f2c5c38d..f5704e7722 100644
--- a/src/util/virnuma.c
+++ b/src/util/virnuma.c
@@ -77,8 +77,8 @@ virNumaGetAutoPlacementAdvice(unsigned short vcpus,
}
#else /* !HAVE_NUMAD */
char *
-virNumaGetAutoPlacementAdvice(unsigned short vcpus ATTRIBUTE_UNUSED,
- unsigned long long balloon ATTRIBUTE_UNUSED)
+virNumaGetAutoPlacementAdvice(unsigned short vcpus G_GNUC_UNUSED,
+ unsigned long long balloon G_GNUC_UNUSED)
{
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("numad is not available on this host"));
@@ -345,7 +345,7 @@ virNumaNodesetToCPUset(virBitmapPtr nodeset,
#else /* !WITH_NUMACTL */
int
-virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode ATTRIBUTE_UNUSED,
+virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode G_GNUC_UNUSED,
virBitmapPtr nodeset)
{
if (!virNumaNodesetIsAvailable(nodeset))
@@ -371,7 +371,7 @@ virNumaGetMaxNode(void)
int
-virNumaGetNodeMemory(int node ATTRIBUTE_UNUSED,
+virNumaGetNodeMemory(int node G_GNUC_UNUSED,
unsigned long long *memsize,
unsigned long long *memfree)
{
@@ -387,7 +387,7 @@ virNumaGetNodeMemory(int node ATTRIBUTE_UNUSED,
int
-virNumaGetNodeCPUs(int node ATTRIBUTE_UNUSED,
+virNumaGetNodeCPUs(int node G_GNUC_UNUSED,
virBitmapPtr *cpus)
{
*cpus = NULL;
@@ -398,7 +398,7 @@ virNumaGetNodeCPUs(int node ATTRIBUTE_UNUSED,
}
int
-virNumaNodesetToCPUset(virBitmapPtr nodeset ATTRIBUTE_UNUSED,
+virNumaNodesetToCPUset(virBitmapPtr nodeset G_GNUC_UNUSED,
virBitmapPtr *cpuset)
{
*cpuset = NULL;
@@ -513,7 +513,7 @@ virNumaNodeIsAvailable(int node)
int
-virNumaGetDistances(int node ATTRIBUTE_UNUSED,
+virNumaGetDistances(int node G_GNUC_UNUSED,
int **distances,
int *ndistances)
{
@@ -965,11 +965,11 @@ virNumaSetPagePoolSize(int node,
#else /* #ifdef __linux__ */
int
-virNumaGetPageInfo(int node ATTRIBUTE_UNUSED,
- unsigned int page_size ATTRIBUTE_UNUSED,
- unsigned long long huge_page_sum ATTRIBUTE_UNUSED,
- unsigned long long *page_avail ATTRIBUTE_UNUSED,
- unsigned long long *page_free ATTRIBUTE_UNUSED)
+virNumaGetPageInfo(int node G_GNUC_UNUSED,
+ unsigned int page_size G_GNUC_UNUSED,
+ unsigned long long huge_page_sum G_GNUC_UNUSED,
+ unsigned long long *page_avail G_GNUC_UNUSED,
+ unsigned long long *page_free G_GNUC_UNUSED)
{
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("page info is not supported on this platform"));
@@ -978,11 +978,11 @@ virNumaGetPageInfo(int node ATTRIBUTE_UNUSED,
int
-virNumaGetPages(int node ATTRIBUTE_UNUSED,
- unsigned int **pages_size ATTRIBUTE_UNUSED,
- unsigned long long **pages_avail ATTRIBUTE_UNUSED,
- unsigned long long **pages_free ATTRIBUTE_UNUSED,
- size_t *npages ATTRIBUTE_UNUSED)
+virNumaGetPages(int node G_GNUC_UNUSED,
+ unsigned int **pages_size G_GNUC_UNUSED,
+ unsigned long long **pages_avail G_GNUC_UNUSED,
+ unsigned long long **pages_free G_GNUC_UNUSED,
+ size_t *npages G_GNUC_UNUSED)
{
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("page info is not supported on this platform"));
@@ -991,10 +991,10 @@ virNumaGetPages(int node ATTRIBUTE_UNUSED,
int
-virNumaSetPagePoolSize(int node ATTRIBUTE_UNUSED,
- unsigned int page_size ATTRIBUTE_UNUSED,
- unsigned long long page_count ATTRIBUTE_UNUSED,
- bool add ATTRIBUTE_UNUSED)
+virNumaSetPagePoolSize(int node G_GNUC_UNUSED,
+ unsigned int page_size G_GNUC_UNUSED,
+ unsigned long long page_count G_GNUC_UNUSED,
+ bool add G_GNUC_UNUSED)
{
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("page pool allocation is not supported on this platform"));
diff --git a/src/util/virobject.c b/src/util/virobject.c
index 919519735a..33feeb659a 100644
--- a/src/util/virobject.c
+++ b/src/util/virobject.c
@@ -605,7 +605,7 @@ void virObjectFreeCallback(void *opaque)
*/
void
virObjectFreeHashData(void *opaque,
- const void *name ATTRIBUTE_UNUSED)
+ const void *name G_GNUC_UNUSED)
{
virObjectUnref(opaque);
}
diff --git a/src/util/virpci.c b/src/util/virpci.c
index 9b828b7781..169501e731 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -2663,7 +2663,7 @@ virPCIGetMdevTypes(const char *sysfspath,
static const char *unsupported = N_("not supported on non-linux platforms");
virPCIDeviceAddressPtr
-virPCIGetDeviceAddressFromSysfsLink(const char *device_link ATTRIBUTE_UNUSED)
+virPCIGetDeviceAddressFromSysfsLink(const char *device_link G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return NULL;
@@ -2671,34 +2671,34 @@ virPCIGetDeviceAddressFromSysfsLink(const char *device_link ATTRIBUTE_UNUSED)
int
-virPCIGetPhysicalFunction(const char *vf_sysfs_path ATTRIBUTE_UNUSED,
- virPCIDeviceAddressPtr *pf ATTRIBUTE_UNUSED)
+virPCIGetPhysicalFunction(const char *vf_sysfs_path G_GNUC_UNUSED,
+ virPCIDeviceAddressPtr *pf G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;
}
int
-virPCIGetVirtualFunctions(const char *sysfs_path ATTRIBUTE_UNUSED,
- virPCIDeviceAddressPtr **virtual_functions ATTRIBUTE_UNUSED,
- size_t *num_virtual_functions ATTRIBUTE_UNUSED,
- unsigned int *max_virtual_functions ATTRIBUTE_UNUSED)
+virPCIGetVirtualFunctions(const char *sysfs_path G_GNUC_UNUSED,
+ virPCIDeviceAddressPtr **virtual_functions G_GNUC_UNUSED,
+ size_t *num_virtual_functions G_GNUC_UNUSED,
+ unsigned int *max_virtual_functions G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;
}
int
-virPCIIsVirtualFunction(const char *vf_sysfs_device_link ATTRIBUTE_UNUSED)
+virPCIIsVirtualFunction(const char *vf_sysfs_device_link G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;
}
int
-virPCIGetVirtualFunctionIndex(const char *pf_sysfs_device_link ATTRIBUTE_UNUSED,
- const char *vf_sysfs_device_link ATTRIBUTE_UNUSED,
- int *vf_index ATTRIBUTE_UNUSED)
+virPCIGetVirtualFunctionIndex(const char *pf_sysfs_device_link G_GNUC_UNUSED,
+ const char *vf_sysfs_device_link G_GNUC_UNUSED,
+ int *vf_index G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;
@@ -2706,36 +2706,36 @@ virPCIGetVirtualFunctionIndex(const char *pf_sysfs_device_link ATTRIBUTE_UNUSED,
}
int
-virPCIGetSysfsFile(char *virPCIDeviceName ATTRIBUTE_UNUSED,
- char **pci_sysfs_device_link ATTRIBUTE_UNUSED)
+virPCIGetSysfsFile(char *virPCIDeviceName G_GNUC_UNUSED,
+ char **pci_sysfs_device_link G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;
}
int
-virPCIDeviceAddressGetSysfsFile(virPCIDeviceAddressPtr dev ATTRIBUTE_UNUSED,
- char **pci_sysfs_device_link ATTRIBUTE_UNUSED)
+virPCIDeviceAddressGetSysfsFile(virPCIDeviceAddressPtr dev G_GNUC_UNUSED,
+ char **pci_sysfs_device_link G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;
}
int
-virPCIGetNetName(const char *device_link_sysfs_path ATTRIBUTE_UNUSED,
- size_t idx ATTRIBUTE_UNUSED,
- char *physPortID ATTRIBUTE_UNUSED,
- char **netname ATTRIBUTE_UNUSED)
+virPCIGetNetName(const char *device_link_sysfs_path G_GNUC_UNUSED,
+ size_t idx G_GNUC_UNUSED,
+ char *physPortID G_GNUC_UNUSED,
+ char **netname G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;
}
int
-virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path ATTRIBUTE_UNUSED,
- int pfNetDevIdx ATTRIBUTE_UNUSED,
- char **pfname ATTRIBUTE_UNUSED,
- int *vf_index ATTRIBUTE_UNUSED)
+virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path G_GNUC_UNUSED,
+ int pfNetDevIdx G_GNUC_UNUSED,
+ char **pfname G_GNUC_UNUSED,
+ int *vf_index G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;
@@ -2743,8 +2743,8 @@ virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path ATTRIBUTE_UNUSED,
ssize_t
-virPCIGetMdevTypes(const char *sysfspath ATTRIBUTE_UNUSED,
- virMediatedDeviceTypePtr **types ATTRIBUTE_UNUSED)
+virPCIGetMdevTypes(const char *sysfspath G_GNUC_UNUSED,
+ virMediatedDeviceTypePtr **types G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;
diff --git a/src/util/virperf.c b/src/util/virperf.c
index 7c328da574..7714d57f6b 100644
--- a/src/util/virperf.c
+++ b/src/util/virperf.c
@@ -322,9 +322,9 @@ virPerfRdtAttrInit(void)
int
-virPerfEventEnable(virPerfPtr perf ATTRIBUTE_UNUSED,
- virPerfEventType type ATTRIBUTE_UNUSED,
- pid_t pid ATTRIBUTE_UNUSED)
+virPerfEventEnable(virPerfPtr perf G_GNUC_UNUSED,
+ virPerfEventType type G_GNUC_UNUSED,
+ pid_t pid G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Perf not supported on this platform"));
@@ -332,8 +332,8 @@ virPerfEventEnable(virPerfPtr perf ATTRIBUTE_UNUSED,
}
int
-virPerfEventDisable(virPerfPtr perf ATTRIBUTE_UNUSED,
- virPerfEventType type ATTRIBUTE_UNUSED)
+virPerfEventDisable(virPerfPtr perf G_GNUC_UNUSED,
+ virPerfEventType type G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Perf not supported on this platform"));
@@ -341,16 +341,16 @@ virPerfEventDisable(virPerfPtr perf ATTRIBUTE_UNUSED,
}
bool
-virPerfEventIsEnabled(virPerfPtr perf ATTRIBUTE_UNUSED,
- virPerfEventType type ATTRIBUTE_UNUSED)
+virPerfEventIsEnabled(virPerfPtr perf G_GNUC_UNUSED,
+ virPerfEventType type G_GNUC_UNUSED)
{
return false;
}
int
-virPerfReadEvent(virPerfPtr perf ATTRIBUTE_UNUSED,
- virPerfEventType type ATTRIBUTE_UNUSED,
- uint64_t *value ATTRIBUTE_UNUSED)
+virPerfReadEvent(virPerfPtr perf G_GNUC_UNUSED,
+ virPerfEventType type G_GNUC_UNUSED,
+ uint64_t *value G_GNUC_UNUSED)
{
virReportSystemError(ENXIO, "%s",
_("Perf not supported on this platform"));
diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c
index a600cfc662..9c2206c618 100644
--- a/src/util/virpidfile.c
+++ b/src/util/virpidfile.c
@@ -384,7 +384,7 @@ int virPidFileAcquirePath(const char *path,
* one that now exists on the filesystem
*/
if (stat(path, &a) < 0) {
- char ebuf[1024] ATTRIBUTE_UNUSED;
+ char ebuf[1024] G_GNUC_UNUSED;
VIR_DEBUG("Pid file '%s' disappeared: %s",
path, virStrerror(errno, ebuf, sizeof(ebuf)));
VIR_FORCE_CLOSE(fd);
diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c
index 634b46e82b..88bcc64472 100644
--- a/src/util/virpolkit.c
+++ b/src/util/virpolkit.c
@@ -209,12 +209,12 @@ virPolkitAgentCreate(void)
#else /* ! WITH_POLKIT */
-int virPolkitCheckAuth(const char *actionid ATTRIBUTE_UNUSED,
- pid_t pid ATTRIBUTE_UNUSED,
- unsigned long long startTime ATTRIBUTE_UNUSED,
- uid_t uid ATTRIBUTE_UNUSED,
- const char **details ATTRIBUTE_UNUSED,
- bool allowInteraction ATTRIBUTE_UNUSED)
+int virPolkitCheckAuth(const char *actionid G_GNUC_UNUSED,
+ pid_t pid G_GNUC_UNUSED,
+ unsigned long long startTime G_GNUC_UNUSED,
+ uid_t uid G_GNUC_UNUSED,
+ const char **details G_GNUC_UNUSED,
+ bool allowInteraction G_GNUC_UNUSED)
{
VIR_ERROR(_("Polkit auth attempted, even though polkit is not available"));
virReportError(VIR_ERR_AUTH_FAILED, "%s",
@@ -224,7 +224,7 @@ int virPolkitCheckAuth(const char *actionid ATTRIBUTE_UNUSED,
void
-virPolkitAgentDestroy(virPolkitAgentPtr agent ATTRIBUTE_UNUSED)
+virPolkitAgentDestroy(virPolkitAgentPtr agent G_GNUC_UNUSED)
{
return; /* do nothing */
}
diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index 0fa648ce74..c91301e525 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -99,7 +99,7 @@ static inline int setns(int fd, int nstype)
# endif
# endif
#else /* !__linux__ */
-static inline int setns(int fd ATTRIBUTE_UNUSED, int nstype ATTRIBUTE_UNUSED)
+static inline int setns(int fd G_GNUC_UNUSED, int nstype G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Namespaces are not supported on this platform."));
@@ -557,8 +557,8 @@ virProcessGetAffinity(pid_t pid)
#else /* HAVE_SCHED_GETAFFINITY */
-int virProcessSetAffinity(pid_t pid ATTRIBUTE_UNUSED,
- virBitmapPtr map ATTRIBUTE_UNUSED)
+int virProcessSetAffinity(pid_t pid G_GNUC_UNUSED,
+ virBitmapPtr map G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Process CPU affinity is not supported on this platform"));
@@ -566,7 +566,7 @@ int virProcessSetAffinity(pid_t pid ATTRIBUTE_UNUSED,
}
virBitmapPtr
-virProcessGetAffinity(pid_t pid ATTRIBUTE_UNUSED)
+virProcessGetAffinity(pid_t pid G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Process CPU affinity is not supported on this platform"));
@@ -699,10 +699,10 @@ virProcessPrLimit(pid_t pid,
}
#elif HAVE_SETRLIMIT
static int
-virProcessPrLimit(pid_t pid ATTRIBUTE_UNUSED,
- int resource ATTRIBUTE_UNUSED,
- const struct rlimit *new_limit ATTRIBUTE_UNUSED,
- struct rlimit *old_limit ATTRIBUTE_UNUSED)
+virProcessPrLimit(pid_t pid G_GNUC_UNUSED,
+ int resource G_GNUC_UNUSED,
+ const struct rlimit *new_limit G_GNUC_UNUSED,
+ struct rlimit *old_limit G_GNUC_UNUSED)
{
errno = ENOSYS;
return -1;
@@ -751,7 +751,7 @@ virProcessSetMaxMemLock(pid_t pid, unsigned long long bytes)
}
#else /* ! (HAVE_SETRLIMIT && defined(RLIMIT_MEMLOCK)) */
int
-virProcessSetMaxMemLock(pid_t pid ATTRIBUTE_UNUSED, unsigned long long bytes)
+virProcessSetMaxMemLock(pid_t pid G_GNUC_UNUSED, unsigned long long bytes)
{
if (bytes == 0)
return 0;
@@ -802,7 +802,7 @@ virProcessGetMaxMemLock(pid_t pid,
}
#else /* ! (HAVE_GETRLIMIT && defined(RLIMIT_MEMLOCK)) */
int
-virProcessGetMaxMemLock(pid_t pid ATTRIBUTE_UNUSED,
+virProcessGetMaxMemLock(pid_t pid G_GNUC_UNUSED,
unsigned long long *bytes)
{
if (!bytes)
@@ -843,7 +843,7 @@ virProcessSetMaxProcesses(pid_t pid, unsigned int procs)
}
#else /* ! (HAVE_SETRLIMIT && defined(RLIMIT_NPROC)) */
int
-virProcessSetMaxProcesses(pid_t pid ATTRIBUTE_UNUSED, unsigned int procs)
+virProcessSetMaxProcesses(pid_t pid G_GNUC_UNUSED, unsigned int procs)
{
if (procs == 0)
return 0;
@@ -891,7 +891,7 @@ virProcessSetMaxFiles(pid_t pid, unsigned int files)
}
#else /* ! (HAVE_SETRLIMIT && defined(RLIMIT_NOFILE)) */
int
-virProcessSetMaxFiles(pid_t pid ATTRIBUTE_UNUSED, unsigned int files)
+virProcessSetMaxFiles(pid_t pid G_GNUC_UNUSED, unsigned int files)
{
if (files == 0)
return 0;
@@ -928,7 +928,7 @@ virProcessSetMaxCoreSize(pid_t pid, unsigned long long bytes)
}
#else /* ! (HAVE_SETRLIMIT && defined(RLIMIT_CORE)) */
int
-virProcessSetMaxCoreSize(pid_t pid ATTRIBUTE_UNUSED,
+virProcessSetMaxCoreSize(pid_t pid G_GNUC_UNUSED,
unsigned long long bytes)
{
if (bytes == 0)
@@ -1046,7 +1046,7 @@ struct _virProcessNamespaceHelperData {
void *opaque;
};
-static int virProcessNamespaceHelper(pid_t pid ATTRIBUTE_UNUSED,
+static int virProcessNamespaceHelper(pid_t pid G_GNUC_UNUSED,
void *opaque)
{
virProcessNamespaceHelperData *data = opaque;
@@ -1215,7 +1215,7 @@ virProcessSetupPrivateMountNS(void)
#if defined(__linux__)
G_GNUC_NORETURN static int
-virProcessDummyChild(void *argv ATTRIBUTE_UNUSED)
+virProcessDummyChild(void *argv G_GNUC_UNUSED)
{
_exit(0);
}
@@ -1263,7 +1263,7 @@ virProcessNamespaceAvailable(unsigned int ns)
cpid = clone(virProcessDummyChild, childStack, flags, NULL);
if (cpid < 0) {
- char ebuf[1024] ATTRIBUTE_UNUSED;
+ char ebuf[1024] G_GNUC_UNUSED;
VIR_DEBUG("clone call returned %s, container support is not enabled",
virStrerror(errno, ebuf, sizeof(ebuf)));
return -1;
@@ -1278,7 +1278,7 @@ virProcessNamespaceAvailable(unsigned int ns)
#else /* !defined(__linux__) */
int
-virProcessNamespaceAvailable(unsigned int ns ATTRIBUTE_UNUSED)
+virProcessNamespaceAvailable(unsigned int ns G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Namespaces are not supported on this platform."));
@@ -1422,9 +1422,9 @@ virProcessSetScheduler(pid_t pid,
#else /* ! HAVE_SCHED_SETSCHEDULER */
int
-virProcessSetScheduler(pid_t pid ATTRIBUTE_UNUSED,
+virProcessSetScheduler(pid_t pid G_GNUC_UNUSED,
virProcessSchedPolicy policy,
- int priority ATTRIBUTE_UNUSED)
+ int priority G_GNUC_UNUSED)
{
if (!policy)
return 0;
diff --git a/src/util/virscsihost.c b/src/util/virscsihost.c
index eea04743db..a5e8583b2b 100644
--- a/src/util/virscsihost.c
+++ b/src/util/virscsihost.c
@@ -259,36 +259,36 @@ virSCSIHostGetNameByParentaddr(unsigned int domain,
#else
int
-virSCSIHostGetUniqueId(const char *sysfs_prefix ATTRIBUTE_UNUSED,
- int host ATTRIBUTE_UNUSED)
+virSCSIHostGetUniqueId(const char *sysfs_prefix G_GNUC_UNUSED,
+ int host G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s", _("Not supported on this platform"));
return -1;
}
char *
-virSCSIHostFindByPCI(const char *sysfs_prefix ATTRIBUTE_UNUSED,
- const char *parentaddr ATTRIBUTE_UNUSED,
- unsigned int unique_id ATTRIBUTE_UNUSED)
+virSCSIHostFindByPCI(const char *sysfs_prefix G_GNUC_UNUSED,
+ const char *parentaddr G_GNUC_UNUSED,
+ unsigned int unique_id G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s", _("Not supported on this platform"));
return NULL;
}
int
-virSCSIHostGetNumber(const char *adapter_name ATTRIBUTE_UNUSED,
- unsigned int *result ATTRIBUTE_UNUSED)
+virSCSIHostGetNumber(const char *adapter_name G_GNUC_UNUSED,
+ unsigned int *result G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s", _("Not supported on this platform"));
return -1;
}
char *
-virSCSIHostGetNameByParentaddr(unsigned int domain ATTRIBUTE_UNUSED,
- unsigned int bus ATTRIBUTE_UNUSED,
- unsigned int slot ATTRIBUTE_UNUSED,
- unsigned int function ATTRIBUTE_UNUSED,
- unsigned int unique_id ATTRIBUTE_UNUSED)
+virSCSIHostGetNameByParentaddr(unsigned int domain G_GNUC_UNUSED,
+ unsigned int bus G_GNUC_UNUSED,
+ unsigned int slot G_GNUC_UNUSED,
+ unsigned int function G_GNUC_UNUSED,
+ unsigned int unique_id G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s", _("Not supported on this platform"));
return NULL;
diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
index bba2089436..77fadb008e 100644
--- a/src/util/virsocketaddr.c
+++ b/src/util/virsocketaddr.c
@@ -584,7 +584,7 @@ virSocketAddrGetPort(virSocketAddrPtr addr)
* address of type AF_UNIX;
*/
char *
-virSocketAddrGetPath(virSocketAddrPtr addr ATTRIBUTE_UNUSED)
+virSocketAddrGetPath(virSocketAddrPtr addr G_GNUC_UNUSED)
{
#ifndef WIN32
char *path = NULL;
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 497ade927e..ef6d7f3ba5 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -1414,7 +1414,7 @@ int virStorageFileGetLVMKey(const char *path,
}
#else
int virStorageFileGetLVMKey(const char *path,
- char **key ATTRIBUTE_UNUSED)
+ char **key G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, _("Unable to get LVM key for %s"), path);
return -1;
@@ -1439,7 +1439,7 @@ int virStorageFileGetLVMKey(const char *path,
int
virStorageFileGetSCSIKey(const char *path,
char **key,
- bool ignoreError ATTRIBUTE_UNUSED)
+ bool ignoreError G_GNUC_UNUSED)
{
int status;
VIR_AUTOPTR(virCommand) cmd = NULL;
@@ -1474,7 +1474,7 @@ virStorageFileGetSCSIKey(const char *path,
}
#else
int virStorageFileGetSCSIKey(const char *path,
- char **key ATTRIBUTE_UNUSED,
+ char **key G_GNUC_UNUSED,
bool ignoreError)
{
if (!ignoreError)
@@ -1551,8 +1551,8 @@ virStorageFileGetNPIVKey(const char *path,
return 0;
}
#else
-int virStorageFileGetNPIVKey(const char *path ATTRIBUTE_UNUSED,
- char **key ATTRIBUTE_UNUSED)
+int virStorageFileGetNPIVKey(const char *path G_GNUC_UNUSED,
+ char **key G_GNUC_UNUSED)
{
return -1;
}
@@ -3218,7 +3218,7 @@ virStorageSourceParseBackingJSONSocketAddress(virStorageNetHostDefPtr host,
static int
virStorageSourceParseBackingJSONGluster(virStorageSourcePtr src,
virJSONValuePtr json,
- int opaque ATTRIBUTE_UNUSED)
+ int opaque G_GNUC_UNUSED)
{
const char *uri = virJSONValueObjectGetString(json, "filename");
const char *volume = virJSONValueObjectGetString(json, "volume");
@@ -3272,7 +3272,7 @@ virStorageSourceParseBackingJSONGluster(virStorageSourcePtr src,
static int
virStorageSourceParseBackingJSONiSCSI(virStorageSourcePtr src,
virJSONValuePtr json,
- int opaque ATTRIBUTE_UNUSED)
+ int opaque G_GNUC_UNUSED)
{
const char *transport = virJSONValueObjectGetString(json, "transport");
const char *portal = virJSONValueObjectGetString(json, "portal");
@@ -3343,7 +3343,7 @@ virStorageSourceParseBackingJSONiSCSI(virStorageSourcePtr src,
static int
virStorageSourceParseBackingJSONNbd(virStorageSourcePtr src,
virJSONValuePtr json,
- int opaque ATTRIBUTE_UNUSED)
+ int opaque G_GNUC_UNUSED)
{
const char *path = virJSONValueObjectGetString(json, "path");
const char *host = virJSONValueObjectGetString(json, "host");
@@ -3393,7 +3393,7 @@ virStorageSourceParseBackingJSONNbd(virStorageSourcePtr src,
static int
virStorageSourceParseBackingJSONSheepdog(virStorageSourcePtr src,
virJSONValuePtr json,
- int opaque ATTRIBUTE_UNUSED)
+ int opaque G_GNUC_UNUSED)
{
const char *filename;
const char *vdi = virJSONValueObjectGetString(json, "vdi");
@@ -3437,7 +3437,7 @@ virStorageSourceParseBackingJSONSheepdog(virStorageSourcePtr src,
static int
virStorageSourceParseBackingJSONSSH(virStorageSourcePtr src,
virJSONValuePtr json,
- int opaque ATTRIBUTE_UNUSED)
+ int opaque G_GNUC_UNUSED)
{
const char *path = virJSONValueObjectGetString(json, "path");
const char *host = virJSONValueObjectGetString(json, "host");
@@ -3480,7 +3480,7 @@ virStorageSourceParseBackingJSONSSH(virStorageSourcePtr src,
static int
virStorageSourceParseBackingJSONRBD(virStorageSourcePtr src,
virJSONValuePtr json,
- int opaque ATTRIBUTE_UNUSED)
+ int opaque G_GNUC_UNUSED)
{
const char *filename;
const char *pool = virJSONValueObjectGetString(json, "pool");
@@ -3535,7 +3535,7 @@ virStorageSourceParseBackingJSONRBD(virStorageSourcePtr src,
static int
virStorageSourceParseBackingJSONRaw(virStorageSourcePtr src,
virJSONValuePtr json,
- int opaque ATTRIBUTE_UNUSED)
+ int opaque G_GNUC_UNUSED)
{
/* There are no interesting attributes in raw driver.
* Treat it as pass-through.
@@ -3547,7 +3547,7 @@ virStorageSourceParseBackingJSONRaw(virStorageSourcePtr src,
static int
virStorageSourceParseBackingJSONVxHS(virStorageSourcePtr src,
virJSONValuePtr json,
- int opaque ATTRIBUTE_UNUSED)
+ int opaque G_GNUC_UNUSED)
{
const char *vdisk_id = virJSONValueObjectGetString(json, "vdisk-id");
virJSONValuePtr server = virJSONValueObjectGetObject(json, "server");
diff --git a/src/util/virstring.c b/src/util/virstring.c
index 0abdcd8b04..6453a23ada 100644
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -630,7 +630,7 @@ virLocaleRevert(virLocale *oldlocale)
}
static void
-virLocaleFixupRadix(char **strp ATTRIBUTE_UNUSED)
+virLocaleFixupRadix(char **strp G_GNUC_UNUSED)
{
}
@@ -639,13 +639,13 @@ virLocaleFixupRadix(char **strp ATTRIBUTE_UNUSED)
typedef int virLocale;
static int
-virLocaleSetRaw(virLocale *oldlocale ATTRIBUTE_UNUSED)
+virLocaleSetRaw(virLocale *oldlocale G_GNUC_UNUSED)
{
return 0;
}
static void
-virLocaleRevert(virLocale *oldlocale ATTRIBUTE_UNUSED)
+virLocaleRevert(virLocale *oldlocale G_GNUC_UNUSED)
{
}
diff --git a/src/util/virutil.c b/src/util/virutil.c
index 89d2cf011f..587540ae03 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -102,7 +102,7 @@ int virSetInherit(int fd, bool inherit)
#else /* WIN32 */
-int virSetInherit(int fd ATTRIBUTE_UNUSED, bool inherit ATTRIBUTE_UNUSED)
+int virSetInherit(int fd G_GNUC_UNUSED, bool inherit G_GNUC_UNUSED)
{
/* FIXME: Currently creating child processes is not supported on
* Win32, so there is no point in failing calls that are only relevant
@@ -129,7 +129,7 @@ int virSetCloseExec(int fd)
}
#ifdef WIN32
-int virSetSockReuseAddr(int fd ATTRIBUTE_UNUSED, bool fatal ATTRIBUTE_UNUSED)
+int virSetSockReuseAddr(int fd G_GNUC_UNUSED, bool fatal G_GNUC_UNUSED)
{
/*
* SO_REUSEADDR on Windows is actually akin to SO_REUSEPORT
@@ -1032,8 +1032,8 @@ virGetGroupList(uid_t uid, gid_t gid, gid_t **list)
* failure (the original system error remains in errno).
*/
int
-virSetUIDGID(uid_t uid, gid_t gid, gid_t *groups ATTRIBUTE_UNUSED,
- int ngroups ATTRIBUTE_UNUSED)
+virSetUIDGID(uid_t uid, gid_t gid, gid_t *groups G_GNUC_UNUSED,
+ int ngroups G_GNUC_UNUSED)
{
if (gid != (gid_t)-1 && setregid(gid, gid) < 0) {
virReportSystemError(errno,
@@ -1063,7 +1063,7 @@ virSetUIDGID(uid_t uid, gid_t gid, gid_t *groups ATTRIBUTE_UNUSED,
#else /* ! HAVE_GETPWUID_R */
int
-virGetGroupList(uid_t uid ATTRIBUTE_UNUSED, gid_t gid ATTRIBUTE_UNUSED,
+virGetGroupList(uid_t uid G_GNUC_UNUSED, gid_t gid G_GNUC_UNUSED,
gid_t **list)
{
*list = NULL;
@@ -1071,13 +1071,13 @@ virGetGroupList(uid_t uid ATTRIBUTE_UNUSED, gid_t gid ATTRIBUTE_UNUSED,
}
bool
-virDoesUserExist(const char *name ATTRIBUTE_UNUSED)
+virDoesUserExist(const char *name G_GNUC_UNUSED)
{
return false;
}
bool
-virDoesGroupExist(const char *name ATTRIBUTE_UNUSED)
+virDoesGroupExist(const char *name G_GNUC_UNUSED)
{
return false;
}
@@ -1129,7 +1129,7 @@ virGetWin32DirectoryRoot(char **path)
char *
-virGetUserDirectoryByUID(uid_t uid ATTRIBUTE_UNUSED)
+virGetUserDirectoryByUID(uid_t uid G_GNUC_UNUSED)
{
/* Since Windows lacks setuid binaries, and since we already fake
* geteuid(), we can safely assume that this is only called when
@@ -1180,7 +1180,7 @@ virGetUserDirectoryByUID(uid_t uid ATTRIBUTE_UNUSED)
}
char *
-virGetUserShell(uid_t uid ATTRIBUTE_UNUSED)
+virGetUserShell(uid_t uid G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("virGetUserShell is not available"));
@@ -1226,7 +1226,7 @@ virGetUserRuntimeDirectory(void)
# else /* !HAVE_GETPWUID_R && !WIN32 */
char *
-virGetUserDirectoryByUID(uid_t uid ATTRIBUTE_UNUSED)
+virGetUserDirectoryByUID(uid_t uid G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("virGetUserDirectory is not available"));
@@ -1235,7 +1235,7 @@ virGetUserDirectoryByUID(uid_t uid ATTRIBUTE_UNUSED)
}
char *
-virGetUserShell(uid_t uid ATTRIBUTE_UNUSED)
+virGetUserShell(uid_t uid G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("virGetUserShell is not available"));
@@ -1272,7 +1272,7 @@ virGetUserRuntimeDirectory(void)
# endif /* ! HAVE_GETPWUID_R && ! WIN32 */
char *
-virGetUserName(uid_t uid ATTRIBUTE_UNUSED)
+virGetUserName(uid_t uid G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("virGetUserName is not available"));
@@ -1280,8 +1280,8 @@ virGetUserName(uid_t uid ATTRIBUTE_UNUSED)
return NULL;
}
-int virGetUserID(const char *name ATTRIBUTE_UNUSED,
- uid_t *uid ATTRIBUTE_UNUSED)
+int virGetUserID(const char *name G_GNUC_UNUSED,
+ uid_t *uid G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("virGetUserID is not available"));
@@ -1290,8 +1290,8 @@ int virGetUserID(const char *name ATTRIBUTE_UNUSED,
}
-int virGetGroupID(const char *name ATTRIBUTE_UNUSED,
- gid_t *gid ATTRIBUTE_UNUSED)
+int virGetGroupID(const char *name G_GNUC_UNUSED,
+ gid_t *gid G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("virGetGroupID is not available"));
@@ -1300,10 +1300,10 @@ int virGetGroupID(const char *name ATTRIBUTE_UNUSED,
}
int
-virSetUIDGID(uid_t uid ATTRIBUTE_UNUSED,
- gid_t gid ATTRIBUTE_UNUSED,
- gid_t *groups ATTRIBUTE_UNUSED,
- int ngroups ATTRIBUTE_UNUSED)
+virSetUIDGID(uid_t uid G_GNUC_UNUSED,
+ gid_t gid G_GNUC_UNUSED,
+ gid_t *groups G_GNUC_UNUSED,
+ int ngroups G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("virSetUIDGID is not available"));
@@ -1311,7 +1311,7 @@ virSetUIDGID(uid_t uid ATTRIBUTE_UNUSED,
}
char *
-virGetGroupName(gid_t gid ATTRIBUTE_UNUSED)
+virGetGroupName(gid_t gid G_GNUC_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("virGetGroupName is not available"));
@@ -1471,8 +1471,8 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
int
virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
- unsigned long long capBits ATTRIBUTE_UNUSED,
- bool clearExistingCaps ATTRIBUTE_UNUSED)
+ unsigned long long capBits G_GNUC_UNUSED,
+ bool clearExistingCaps G_GNUC_UNUSED)
{
return virSetUIDGID(uid, gid, groups, ngroups);
}
@@ -1512,7 +1512,7 @@ virIsDevMapperDevice(const char *dev_name)
return false;
}
#else
-bool virIsDevMapperDevice(const char *dev_name ATTRIBUTE_UNUSED)
+bool virIsDevMapperDevice(const char *dev_name G_GNUC_UNUSED)
{
return false;
}
@@ -1562,9 +1562,9 @@ virGetDeviceID(const char *path, int *maj, int *min)
}
#else
int
-virGetDeviceID(const char *path ATTRIBUTE_UNUSED,
- int *maj ATTRIBUTE_UNUSED,
- int *min ATTRIBUTE_UNUSED)
+virGetDeviceID(const char *path G_GNUC_UNUSED,
+ int *maj G_GNUC_UNUSED,
+ int *min G_GNUC_UNUSED)
{
return -ENOSYS;
}
diff --git a/src/util/virvhba.c b/src/util/virvhba.c
index 203ba43a3d..ac80d9bd79 100644
--- a/src/util/virvhba.c
+++ b/src/util/virvhba.c
@@ -467,8 +467,8 @@ virVHBAGetHostByFabricWWN(const char *sysfs_prefix,
#else
bool
-virVHBAPathExists(const char *sysfs_prefix ATTRIBUTE_UNUSED,
- int host ATTRIBUTE_UNUSED)
+virVHBAPathExists(const char *sysfs_prefix G_GNUC_UNUSED,
+ int host G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s", _("Not supported on this platform"));
return false;
@@ -476,8 +476,8 @@ virVHBAPathExists(const char *sysfs_prefix ATTRIBUTE_UNUSED,
bool
-virVHBAIsVportCapable(const char *sysfs_prefix ATTRIBUTE_UNUSED,
- int host ATTRIBUTE_UNUSED)
+virVHBAIsVportCapable(const char *sysfs_prefix G_GNUC_UNUSED,
+ int host G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s", _("Not supported on this platform"));
return false;
@@ -485,9 +485,9 @@ virVHBAIsVportCapable(const char *sysfs_prefix ATTRIBUTE_UNUSED,
char *
-virVHBAGetConfig(const char *sysfs_prefix ATTRIBUTE_UNUSED,
- int host ATTRIBUTE_UNUSED,
- const char *entry ATTRIBUTE_UNUSED)
+virVHBAGetConfig(const char *sysfs_prefix G_GNUC_UNUSED,
+ int host G_GNUC_UNUSED,
+ const char *entry G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s", _("Not supported on this platform"));
return NULL;
@@ -495,7 +495,7 @@ virVHBAGetConfig(const char *sysfs_prefix ATTRIBUTE_UNUSED,
char *
-virVHBAFindVportHost(const char *sysfs_prefix ATTRIBUTE_UNUSED)
+virVHBAFindVportHost(const char *sysfs_prefix G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s", _("Not supported on this platform"));
return NULL;
@@ -503,10 +503,10 @@ virVHBAFindVportHost(const char *sysfs_prefix ATTRIBUTE_UNUSED)
int
-virVHBAManageVport(const int parent_host ATTRIBUTE_UNUSED,
- const char *wwpn ATTRIBUTE_UNUSED,
- const char *wwnn ATTRIBUTE_UNUSED,
- int operation ATTRIBUTE_UNUSED)
+virVHBAManageVport(const int parent_host G_GNUC_UNUSED,
+ const char *wwpn G_GNUC_UNUSED,
+ const char *wwnn G_GNUC_UNUSED,
+ int operation G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s", _("Not supported on this platform"));
return -1;
@@ -514,9 +514,9 @@ virVHBAManageVport(const int parent_host ATTRIBUTE_UNUSED,
char *
-virVHBAGetHostByWWN(const char *sysfs_prefix ATTRIBUTE_UNUSED,
- const char *wwnn ATTRIBUTE_UNUSED,
- const char *wwpn ATTRIBUTE_UNUSED)
+virVHBAGetHostByWWN(const char *sysfs_prefix G_GNUC_UNUSED,
+ const char *wwnn G_GNUC_UNUSED,
+ const char *wwpn G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s", _("Not supported on this platform"));
return NULL;
@@ -524,8 +524,8 @@ virVHBAGetHostByWWN(const char *sysfs_prefix ATTRIBUTE_UNUSED,
char *
-virVHBAGetHostByFabricWWN(const char *sysfs_prefix ATTRIBUTE_UNUSED,
- const char *fabric_wwn ATTRIBUTE_UNUSED)
+virVHBAGetHostByFabricWWN(const char *sysfs_prefix G_GNUC_UNUSED,
+ const char *fabric_wwn G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s", _("Not supported on this platform"));
return NULL;
diff --git a/src/util/virvsock.c b/src/util/virvsock.c
index ebb5182619..b28287fdee 100644
--- a/src/util/virvsock.c
+++ b/src/util/virvsock.c
@@ -45,8 +45,8 @@ virVsockSetGuestCidQuiet(int fd,
#else
static int
-virVsockSetGuestCidQuiet(int fd ATTRIBUTE_UNUSED,
- unsigned int guest_cid ATTRIBUTE_UNUSED)
+virVsockSetGuestCidQuiet(int fd G_GNUC_UNUSED,
+ unsigned int guest_cid G_GNUC_UNUSED)
{
errno = ENOSYS;
return -1;
diff --git a/src/util/virxml.c b/src/util/virxml.c
index 245ca0a752..46c79e2d94 100644
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -703,7 +703,7 @@ virXPathNodeSet(const char *xpath,
* This version is heavily based on xmlParserPrintFileContextInternal from libxml2.
*/
static void
-catchXMLError(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...)
+catchXMLError(void *ctx, const char *msg G_GNUC_UNUSED, ...)
{
xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
@@ -1246,8 +1246,8 @@ static void catchRNGError(void *ctx,
}
-static void ignoreRNGError(void *ctx ATTRIBUTE_UNUSED,
- const char *msg ATTRIBUTE_UNUSED,
+static void ignoreRNGError(void *ctx G_GNUC_UNUSED,
+ const char *msg G_GNUC_UNUSED,
...)
{}
--
2.19.2
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
