Add an exception for the GLib versions of the macros we already ignore. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- docs/apibuild.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/apibuild.py b/docs/apibuild.py index 92886e1276..b11d3fd5a9 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -73,6 +73,8 @@ admin_included_files = { ignored_words = { "ATTRIBUTE_UNUSED": (0, "macro keyword"), "ATTRIBUTE_SENTINEL": (0, "macro keyword"), + "G_GNUC_UNUSED": (0, "macro keyword"), + "G_GNUC_NULL_TERMINATED": (0, "macro keyword"), "VIR_DEPRECATED": (0, "macro keyword"), "VIR_EXPORT_VAR": (0, "macro keyword"), "WINAPI": (0, "Windows keyword"), -- 2.19.2

Prefer G_GNUC_NULL_TERMINATED which was introduced in GLib 2.8. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_monitor_json.c | 2 +- src/util/virbuffer.h | 2 +- src/util/vircommand.h | 4 ++-- src/util/virfile.h | 2 +- src/util/virfirewall.h | 4 ++-- src/util/virjson.h | 4 ++-- src/util/virtypedparam.h | 2 +- src/vz/vz_utils.h | 2 +- tests/domaincapstest.c | 2 +- tests/qemumonitortestutils.h | 2 +- tests/testutils.h | 4 ++-- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 0ef8b563f5..62edb665a7 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1159,7 +1159,7 @@ qemuAgentCommand(qemuAgentPtr mon, return ret; } -static virJSONValuePtr ATTRIBUTE_SENTINEL +static virJSONValuePtr G_GNUC_NULL_TERMINATED qemuAgentMakeCommand(const char *cmdname, ...) { diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index dbc32acb5e..6818e726c6 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -557,7 +557,7 @@ qemuMonitorJSONMakeCommandInternal(const char *cmdname, } -static virJSONValuePtr ATTRIBUTE_SENTINEL +static virJSONValuePtr G_GNUC_NULL_TERMINATED qemuMonitorJSONMakeCommand(const char *cmdname, ...) { diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h index d5a7a8dc33..75e26c32ff 100644 --- a/src/util/virbuffer.h +++ b/src/util/virbuffer.h @@ -77,7 +77,7 @@ void virBufferAsprintf(virBufferPtr buf, const char *format, ...) void virBufferVasprintf(virBufferPtr buf, const char *format, va_list ap) ATTRIBUTE_FMT_PRINTF(2, 0); void virBufferStrcat(virBufferPtr buf, ...) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; void virBufferStrcatVArgs(virBufferPtr buf, va_list ap); void virBufferEscape(virBufferPtr buf, char escape, const char *toescape, diff --git a/src/util/vircommand.h b/src/util/vircommand.h index 1a7158d4c1..632d02bc71 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -42,7 +42,7 @@ virCommandPtr virCommandNew(const char *binary) ATTRIBUTE_NONNULL(1); virCommandPtr virCommandNewArgs(const char *const*args) ATTRIBUTE_NONNULL(1); virCommandPtr virCommandNewArgList(const char *binary, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; + ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; virCommandPtr virCommandNewVAList(const char *binary, va_list list) ATTRIBUTE_NONNULL(1); @@ -137,7 +137,7 @@ void virCommandAddArgSet(virCommandPtr cmd, void virCommandAddArgList(virCommandPtr cmd, ... /* const char *arg, ..., NULL */) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; void virCommandSetWorkingDirectory(virCommandPtr cmd, const char *pwd) ATTRIBUTE_NONNULL(2); diff --git a/src/util/virfile.h b/src/util/virfile.h index 2b037b00aa..f22380550c 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -317,7 +317,7 @@ char *virFileFindMountPoint(const char *type); /* NB: this should be combined with virFileBuildPath */ #define virBuildPath(path, ...) \ virBuildPathInternal(path, __VA_ARGS__, NULL) -int virBuildPathInternal(char **path, ...) ATTRIBUTE_SENTINEL; +int virBuildPathInternal(char **path, ...) G_GNUC_NULL_TERMINATED; int virFilePrintf(FILE *fp, const char *msg, ...) ATTRIBUTE_FMT_PRINTF(2, 3); diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h index ff4626975b..a2c0e9c26d 100644 --- a/src/util/virfirewall.h +++ b/src/util/virfirewall.h @@ -65,7 +65,7 @@ virFirewallRulePtr virFirewallAddRuleFull(virFirewallPtr firewall, virFirewallQueryCallback cb, void *opaque, ...) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; void virFirewallRemoveRule(virFirewallPtr firewall, virFirewallRulePtr rule); @@ -88,7 +88,7 @@ void virFirewallRuleAddArgSet(virFirewallPtr firewall, void virFirewallRuleAddArgList(virFirewallPtr firewall, virFirewallRulePtr rule, ...) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; size_t virFirewallRuleGetArgCount(virFirewallRulePtr rule); diff --git a/src/util/virjson.h b/src/util/virjson.h index a5f959595f..65b8d5620a 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -48,11 +48,11 @@ void virJSONValueHashFree(void *opaque, const void *name); virJSONType virJSONValueGetType(const virJSONValue *value); int virJSONValueObjectCreate(virJSONValuePtr *obj, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; + ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; int virJSONValueObjectCreateVArgs(virJSONValuePtr *obj, va_list args) ATTRIBUTE_NONNULL(1); int virJSONValueObjectAdd(virJSONValuePtr obj, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; + ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; int virJSONValueObjectAddVArgs(virJSONValuePtr obj, va_list args) ATTRIBUTE_NONNULL(1); diff --git a/src/util/virtypedparam.h b/src/util/virtypedparam.h index 34cff1b2b3..2c998978ea 100644 --- a/src/util/virtypedparam.h +++ b/src/util/virtypedparam.h @@ -62,7 +62,7 @@ struct _virTypedParameterRemote { int virTypedParamsValidate(virTypedParameterPtr params, int nparams, /* const char *name, int type ... */ ...) - ATTRIBUTE_SENTINEL ATTRIBUTE_RETURN_CHECK; + G_GNUC_NULL_TERMINATED ATTRIBUTE_RETURN_CHECK; bool virTypedParamsCheck(virTypedParameterPtr params, int nparams, diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index f116f9dd1f..7ebb34bb11 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -122,7 +122,7 @@ void vzDomObjFree(void *p); virDomainObjPtr vzDomObjFromDomain(virDomainPtr domain); char * vzGetOutput(const char *binary, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; + ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; vzDriverPtr vzGetDriverConnection(void); diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index b6961a986b..db14114cba 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -27,7 +27,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE #if WITH_QEMU || WITH_BHYVE -static int ATTRIBUTE_SENTINEL +static int G_GNUC_NULL_TERMINATED fillStringValues(virDomainCapsStringValuesPtr values, ...) { int ret = 0; diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h index 75ea63382d..2333fceed0 100644 --- a/tests/qemumonitortestutils.h +++ b/tests/qemumonitortestutils.h @@ -65,7 +65,7 @@ int qemuMonitorTestAddItemParams(qemuMonitorTestPtr test, const char *cmdname, const char *response, ...) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; int qemuMonitorTestAddItemExpect(qemuMonitorTestPtr test, const char *cmdname, diff --git a/tests/testutils.h b/tests/testutils.h index 85ba9fbc0b..9099a77664 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -48,9 +48,9 @@ int virTestRun(const char *title, const void *data); int virTestLoadFile(const char *file, char **buf); char *virTestLoadFilePath(const char *p, ...) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; virJSONValuePtr virTestLoadFileJSON(const char *p, ...) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; int virTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen); -- 2.19.2

Name the macro G_GNUC_UNUSED instead of ATTRIBUTE_UNUSED to match the rest of libvirt code. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- examples/c/misc/event-test.c | 140 +++++++++++++++++------------------ 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/examples/c/misc/event-test.c b/examples/c/misc/event-test.c index fcf4492470..533b8da9bf 100644 --- a/examples/c/misc/event-test.c +++ b/examples/c/misc/event-test.c @@ -21,17 +21,17 @@ # define verify(cond) #endif -#ifndef ATTRIBUTE_UNUSED -# define ATTRIBUTE_UNUSED __attribute__((__unused__)) +#ifndef G_GNUC_UNUSED +# define G_GNUC_UNUSED __attribute__((__unused__)) #endif int run = 1; /* Callback functions */ static void -connectClose(virConnectPtr conn ATTRIBUTE_UNUSED, +connectClose(virConnectPtr conn G_GNUC_UNUSED, int reason, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { run = 0; @@ -404,11 +404,11 @@ secretEventToString(int event) static int -myDomainEventCallback1(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventCallback1(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int event, int detail, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) %s %s\n", __func__, virDomainGetName(dom), virDomainGetID(dom), eventToString(event), @@ -418,11 +418,11 @@ myDomainEventCallback1(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myDomainEventCallback2(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventCallback2(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int event, int detail, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) %s %s\n", __func__, virDomainGetName(dom), virDomainGetID(dom), eventToString(event), @@ -432,9 +432,9 @@ myDomainEventCallback2(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myDomainEventRebootCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventRebootCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) rebooted\n", __func__, virDomainGetName(dom), virDomainGetID(dom)); @@ -444,10 +444,10 @@ myDomainEventRebootCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myDomainEventRTCChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventRTCChangeCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, long long offset, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) rtc change %" PRIdMAX "\n", __func__, virDomainGetName(dom), virDomainGetID(dom), @@ -458,10 +458,10 @@ myDomainEventRTCChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myDomainEventBalloonChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventBalloonChangeCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, unsigned long long actual, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) balloon change %" PRIuMAX "KB\n", __func__, virDomainGetName(dom), virDomainGetID(dom), (uintmax_t)actual); @@ -471,10 +471,10 @@ myDomainEventBalloonChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myDomainEventWatchdogCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventWatchdogCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int action, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) watchdog action=%d\n", __func__, virDomainGetName(dom), virDomainGetID(dom), action); @@ -484,12 +484,12 @@ myDomainEventWatchdogCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myDomainEventIOErrorCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventIOErrorCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *srcPath, const char *devAlias, int action, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) io error path=%s alias=%s action=%d\n", __func__, virDomainGetName(dom), virDomainGetID(dom), @@ -500,13 +500,13 @@ myDomainEventIOErrorCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myDomainEventIOErrorReasonCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventIOErrorReasonCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *srcPath, const char *devAlias, int action, const char *reason, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) io error (reason) path=%s alias=%s " "action=%d reason=%s\n", @@ -539,14 +539,14 @@ graphicsPhaseToStr(int phase) static int -myDomainEventGraphicsCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventGraphicsCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int phase, virDomainEventGraphicsAddressPtr local, virDomainEventGraphicsAddressPtr remote, const char *authScheme, virDomainEventGraphicsSubjectPtr subject, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { size_t i; printf("%s EVENT: Domain %s(%d) graphics ", __func__, virDomainGetName(dom), @@ -572,9 +572,9 @@ myDomainEventGraphicsCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myDomainEventControlErrorCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventControlErrorCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) control error\n", __func__, virDomainGetName(dom), virDomainGetID(dom)); @@ -601,13 +601,13 @@ diskChangeReasonToStr(int reason) static int -myDomainEventDiskChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventDiskChangeCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *oldSrcPath, const char *newSrcPath, const char *devAlias, int reason, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) disk change oldSrcPath: %s newSrcPath: %s " "devAlias: %s reason: %s\n", @@ -635,11 +635,11 @@ trayChangeReasonToStr(int reason) static int -myDomainEventTrayChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventTrayChangeCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *devAlias, int reason, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) removable disk's tray change devAlias: %s " "reason: %s\n", @@ -650,10 +650,10 @@ myDomainEventTrayChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myDomainEventPMWakeupCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventPMWakeupCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, - int reason ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + int reason G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) system pmwakeup\n", __func__, virDomainGetName(dom), virDomainGetID(dom)); @@ -662,10 +662,10 @@ myDomainEventPMWakeupCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myDomainEventPMSuspendCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventPMSuspendCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, - int reason ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + int reason G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) system pmsuspend\n", __func__, virDomainGetName(dom), virDomainGetID(dom)); @@ -674,10 +674,10 @@ myDomainEventPMSuspendCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myDomainEventPMSuspendDiskCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventPMSuspendDiskCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, - int reason ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + int reason G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) system pmsuspend-disk\n", __func__, virDomainGetName(dom), virDomainGetID(dom)); @@ -686,10 +686,10 @@ myDomainEventPMSuspendDiskCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myDomainEventDeviceRemovedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventDeviceRemovedCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *devAlias, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) device removed: %s\n", __func__, virDomainGetName(dom), virDomainGetID(dom), devAlias); @@ -698,11 +698,11 @@ myDomainEventDeviceRemovedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myNetworkEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myNetworkEventCallback(virConnectPtr conn G_GNUC_UNUSED, virNetworkPtr dom, int event, int detail, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Network %s %s %d\n", __func__, virNetworkGetName(dom), networkEventToString(event), detail); @@ -710,11 +710,11 @@ myNetworkEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, } static int -myStoragePoolEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myStoragePoolEventCallback(virConnectPtr conn G_GNUC_UNUSED, virStoragePoolPtr pool, int event, int detail, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Storage pool %s %s %d\n", __func__, virStoragePoolGetName(pool), @@ -725,9 +725,9 @@ myStoragePoolEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myStoragePoolEventRefreshCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myStoragePoolEventRefreshCallback(virConnectPtr conn G_GNUC_UNUSED, virStoragePoolPtr pool, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Storage pool %s refresh\n", __func__, virStoragePoolGetName(pool)); @@ -736,11 +736,11 @@ myStoragePoolEventRefreshCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myNodeDeviceEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myNodeDeviceEventCallback(virConnectPtr conn G_GNUC_UNUSED, virNodeDevicePtr dev, int event, int detail, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Node device %s %s %d\n", __func__, virNodeDeviceGetName(dev), @@ -751,9 +751,9 @@ myNodeDeviceEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myNodeDeviceEventUpdateCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myNodeDeviceEventUpdateCallback(virConnectPtr conn G_GNUC_UNUSED, virNodeDevicePtr dev, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Node device %s update\n", __func__, virNodeDeviceGetName(dev)); @@ -762,11 +762,11 @@ myNodeDeviceEventUpdateCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -mySecretEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +mySecretEventCallback(virConnectPtr conn G_GNUC_UNUSED, virSecretPtr secret, int event, int detail, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { char uuid[VIR_UUID_STRING_BUFLEN]; virSecretGetUUIDString(secret, uuid); @@ -779,9 +779,9 @@ mySecretEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -mySecretEventValueChanged(virConnectPtr conn ATTRIBUTE_UNUSED, +mySecretEventValueChanged(virConnectPtr conn G_GNUC_UNUSED, virSecretPtr secret, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { char uuid[VIR_UUID_STRING_BUFLEN]; virSecretGetUUIDString(secret, uuid); @@ -829,11 +829,11 @@ eventTypedParamsPrint(virTypedParameterPtr params, static int -myDomainEventTunableCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventTunableCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, virTypedParameterPtr params, int nparams, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) tunable updated:\n", __func__, virDomainGetName(dom), virDomainGetID(dom)); @@ -845,11 +845,11 @@ myDomainEventTunableCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myDomainEventAgentLifecycleCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventAgentLifecycleCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int state, int reason, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) guest agent state changed: %s reason: %s\n", __func__, virDomainGetName(dom), virDomainGetID(dom), @@ -861,10 +861,10 @@ myDomainEventAgentLifecycleCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myDomainEventDeviceAddedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventDeviceAddedCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *devAlias, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) device added: %s\n", __func__, virDomainGetName(dom), virDomainGetID(dom), devAlias); @@ -922,7 +922,7 @@ blockJobStatusToStr(int status) static int -myDomainEventBlockJobCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventBlockJobCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *disk, int type, @@ -940,13 +940,13 @@ myDomainEventBlockJobCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myDomainEventBlockThresholdCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventBlockThresholdCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *dev, const char *path, unsigned long long threshold, unsigned long long excess, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { /* Casts to uint64_t to work around mingw not knowing %lld */ printf("%s EVENT: Domain %s(%d) block threshold callback dev '%s'(%s), " @@ -958,10 +958,10 @@ myDomainEventBlockThresholdCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myDomainEventMigrationIterationCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventMigrationIterationCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int iteration, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) migration iteration '%d'\n", __func__, virDomainGetName(dom), virDomainGetID(dom), iteration); @@ -970,11 +970,11 @@ myDomainEventMigrationIterationCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myDomainEventJobCompletedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventJobCompletedCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, virTypedParameterPtr params, int nparams, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) job completed:\n", __func__, virDomainGetName(dom), virDomainGetID(dom)); @@ -986,10 +986,10 @@ myDomainEventJobCompletedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int -myDomainEventDeviceRemovalFailedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventDeviceRemovalFailedCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *devAlias, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) device removal failed: %s\n", __func__, virDomainGetName(dom), virDomainGetID(dom), devAlias); @@ -1018,11 +1018,11 @@ metadataTypeToStr(int status) } static int -myDomainEventMetadataChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventMetadataChangeCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int type, const char *nsuri, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { const char *typestr = metadataTypeToStr(type); printf("%s EVENT: Domain %s(%d) metadata type: %s (%s)\n", -- 2.19.2

On Tue, Oct 15, 2019 at 10:40:47AM +0200, Michal Privoznik wrote: Having libvirt.so and glib.so does not necessarily mean you need to have the GLib headers installed. The idea for examples is to use base C with no other dependencies than libvirt, see e.g.: commit acf522e85a9747457e6d81a6cae9eef1cf677ff0 examples: Avoid gnulib, have standalone examples or commit 6933ebc497f5b432c0dc8c89450a2723c45371bd examples: Drop event-test.c dependency on gnulib <verify.h> Jano

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/admin/admin_remote.c | 4 +-- src/admin/admin_server_dispatch.c | 60 +++++++++++++++---------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index 0846e72f6d..8e0752746c 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -76,7 +76,7 @@ make_nonnull_client(admin_nonnull_client *client_dst, } static int -callFull(virAdmConnectPtr conn ATTRIBUTE_UNUSED, +callFull(virAdmConnectPtr conn G_GNUC_UNUSED, remoteAdminPrivPtr priv, int *fdin, size_t fdinlen, @@ -130,7 +130,7 @@ call(virAdmConnectPtr conn, #include "admin_client.h" static void -remoteAdminClientCloseFunc(virNetClientPtr client ATTRIBUTE_UNUSED, +remoteAdminClientCloseFunc(virNetClientPtr client G_GNUC_UNUSED, int reason, void *opaque) { diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dispatch.c index f07ae6df1d..4cc41428ed 100644 --- a/src/admin/admin_server_dispatch.c +++ b/src/admin/admin_server_dispatch.c @@ -60,7 +60,7 @@ remoteAdmClientFree(void *data) } void * -remoteAdmClientNew(virNetServerClientPtr client ATTRIBUTE_UNUSED, +remoteAdmClientNew(virNetServerClientPtr client G_GNUC_UNUSED, void *opaque) { struct daemonAdmClientPrivate *priv; @@ -107,14 +107,14 @@ remoteAdmClientNew(virNetServerClientPtr client ATTRIBUTE_UNUSED, } void *remoteAdmClientNewPostExecRestart(virNetServerClientPtr client, - virJSONValuePtr object ATTRIBUTE_UNUSED, + virJSONValuePtr object G_GNUC_UNUSED, void *opaque) { return remoteAdmClientNew(client, opaque); } -virJSONValuePtr remoteAdmClientPreExecRestart(virNetServerClientPtr client ATTRIBUTE_UNUSED, - void *data ATTRIBUTE_UNUSED) +virJSONValuePtr remoteAdmClientPreExecRestart(virNetServerClientPtr client G_GNUC_UNUSED, + void *data G_GNUC_UNUSED) { virJSONValuePtr object = virJSONValueNewObject(); @@ -162,9 +162,9 @@ make_nonnull_client(admin_nonnull_client *clt_dst, /* Functions */ static int -adminDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED, +adminDispatchConnectOpen(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, struct admin_connect_open_args *args) { @@ -188,17 +188,17 @@ adminDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -adminDispatchConnectClose(virNetServerPtr server ATTRIBUTE_UNUSED, +adminDispatchConnectClose(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED) + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED) { virNetServerClientDelayedClose(client); return 0; } static int -adminConnectGetLibVersion(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, +adminConnectGetLibVersion(virNetDaemonPtr dmn G_GNUC_UNUSED, unsigned long long *libVer) { if (libVer) @@ -216,9 +216,9 @@ adminGetConn(virNetServerClientPtr client) } static int -adminDispatchServerGetThreadpoolParameters(virNetServerPtr server ATTRIBUTE_UNUSED, +adminDispatchServerGetThreadpoolParameters(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, struct admin_server_get_threadpool_parameters_args *args, struct admin_server_get_threadpool_parameters_ret *ret) @@ -254,9 +254,9 @@ adminDispatchServerGetThreadpoolParameters(virNetServerPtr server ATTRIBUTE_UNUS } static int -adminDispatchServerSetThreadpoolParameters(virNetServerPtr server ATTRIBUTE_UNUSED, +adminDispatchServerSetThreadpoolParameters(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, struct admin_server_set_threadpool_parameters_args *args) { @@ -297,9 +297,9 @@ adminDispatchServerSetThreadpoolParameters(virNetServerPtr server ATTRIBUTE_UNUS } static int -adminDispatchClientGetInfo(virNetServerPtr server ATTRIBUTE_UNUSED, +adminDispatchClientGetInfo(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, struct admin_client_get_info_args *args, struct admin_client_get_info_ret *ret) @@ -349,10 +349,10 @@ adminDispatchClientGetInfo(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -adminDispatchServerGetClientLimits(virNetServerPtr server ATTRIBUTE_UNUSED, +adminDispatchServerGetClientLimits(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED, admin_server_get_client_limits_args *args, admin_server_get_client_limits_ret *ret) { @@ -386,10 +386,10 @@ adminDispatchServerGetClientLimits(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -adminDispatchServerSetClientLimits(virNetServerPtr server ATTRIBUTE_UNUSED, +adminDispatchServerSetClientLimits(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED, admin_server_set_client_limits_args *args) { int rv = -1; @@ -455,7 +455,7 @@ adminConnectGetLoggingFilters(char **filters, unsigned int flags) } static int -adminConnectSetLoggingOutputs(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, +adminConnectSetLoggingOutputs(virNetDaemonPtr dmn G_GNUC_UNUSED, const char *outputs, unsigned int flags) { @@ -465,7 +465,7 @@ adminConnectSetLoggingOutputs(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, } static int -adminConnectSetLoggingFilters(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, +adminConnectSetLoggingFilters(virNetDaemonPtr dmn G_GNUC_UNUSED, const char *filters, unsigned int flags) { @@ -475,9 +475,9 @@ adminConnectSetLoggingFilters(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, } static int -adminDispatchConnectGetLoggingOutputs(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, +adminDispatchConnectGetLoggingOutputs(virNetServerPtr server G_GNUC_UNUSED, + virNetServerClientPtr client G_GNUC_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, admin_connect_get_logging_outputs_args *args, admin_connect_get_logging_outputs_ret *ret) @@ -497,9 +497,9 @@ adminDispatchConnectGetLoggingOutputs(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -adminDispatchConnectGetLoggingFilters(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, +adminDispatchConnectGetLoggingFilters(virNetServerPtr server G_GNUC_UNUSED, + virNetServerClientPtr client G_GNUC_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, admin_connect_get_logging_filters_args *args, admin_connect_get_logging_filters_ret *ret) -- 2.19.2

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/conf/capabilities.c | 6 +- src/conf/domain_addr.c | 22 ++++---- src/conf/domain_audit.c | 2 +- src/conf/domain_capabilities.c | 2 +- src/conf/domain_conf.c | 28 +++++----- src/conf/domain_event.c | 2 +- src/conf/network_conf.c | 80 +++++++++++++-------------- src/conf/node_device_conf.c | 10 ++-- src/conf/nwfilter_conf.c | 50 ++++++++--------- src/conf/nwfilter_params.c | 2 +- src/conf/object_event.c | 2 +- src/conf/virchrdev.c | 10 ++-- src/conf/virdomaincheckpointobjlist.c | 2 +- src/conf/virdomainmomentobjlist.c | 6 +- src/conf/virdomainobjlist.c | 12 ++-- src/conf/virinterfaceobj.c | 10 ++-- src/conf/virnetworkobj.c | 18 +++--- src/conf/virnodedeviceobj.c | 16 +++--- src/conf/virnwfilterbindingobjlist.c | 4 +- src/conf/virsecretobj.c | 8 +-- src/conf/virstorageobj.c | 22 ++++---- 21 files changed, 157 insertions(+), 157 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 7419d9cfc8..1781c1df0a 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1485,8 +1485,8 @@ virCapabilitiesGetNodeInfo(virNodeInfoPtr nodeinfo) /* returns 1 on success, 0 if the detection failed and -1 on hard error */ static int -virCapabilitiesFillCPUInfo(int cpu_id ATTRIBUTE_UNUSED, - virCapsHostNUMACellCPUPtr cpu ATTRIBUTE_UNUSED) +virCapabilitiesFillCPUInfo(int cpu_id G_GNUC_UNUSED, + virCapsHostNUMACellCPUPtr cpu G_GNUC_UNUSED) { #ifdef __linux__ cpu->id = cpu_id; @@ -1592,7 +1592,7 @@ virCapabilitiesInitNUMAFake(virCapsPtr caps) int ncpus; int s, c, t; int id, cid; - int onlinecpus ATTRIBUTE_UNUSED; + int onlinecpus G_GNUC_UNUSED; bool tmp; if (virCapabilitiesGetNodeInfo(&nodeinfo) < 0) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 4e02c43375..fc612ee6a2 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1301,8 +1301,8 @@ virDomainPCIAddressReserveNextAddr(virDomainPCIAddressSetPtr addrs, static int -virDomainPCIAddressSetMultiIter(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, +virDomainPCIAddressSetMultiIter(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *data) { @@ -1335,9 +1335,9 @@ virDomainPCIAddressSetMultiIter(virDomainDefPtr def ATTRIBUTE_UNUSED, static int virDomainPCIAddressSetAllMultiIter(virDomainDefPtr def, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, - void *data ATTRIBUTE_UNUSED) + void *data G_GNUC_UNUSED) { virPCIDeviceAddressPtr testAddr; @@ -1463,8 +1463,8 @@ virDomainCCWAddressAssign(virDomainDeviceInfoPtr dev, } static int ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) -virDomainCCWAddressAllocate(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, +virDomainCCWAddressAllocate(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *data) { @@ -1472,8 +1472,8 @@ virDomainCCWAddressAllocate(virDomainDefPtr def ATTRIBUTE_UNUSED, } static int ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) -virDomainCCWAddressValidate(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, +virDomainCCWAddressValidate(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *data) { @@ -1682,8 +1682,8 @@ virDomainVirtioSerialAddrSetFree(virDomainVirtioSerialAddrSetPtr addrs) * opaque should be the address set */ static int ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) -virDomainVirtioSerialAddrReserve(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, +virDomainVirtioSerialAddrReserve(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *data) { @@ -2422,7 +2422,7 @@ virDomainUSBAddressAssign(virDomainUSBAddressSetPtr addrs, int virDomainUSBAddressPresent(virDomainDeviceInfoPtr info, - void *data ATTRIBUTE_UNUSED) + void *data G_GNUC_UNUSED) { if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB && virDomainUSBAddressPortIsValid(info->addr.usb.port)) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index cc5a55a635..e455661e4f 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -59,7 +59,7 @@ virDomainAuditGetRdev(const char *path) } #else static char * -virDomainAuditGetRdev(const char *path ATTRIBUTE_UNUSED) +virDomainAuditGetRdev(const char *path G_GNUC_UNUSED) { return NULL; } diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index fe93388cce..b0fdd15d6c 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -690,7 +690,7 @@ virDomainCapsDeviceRNGDefValidate(virDomainCapsPtr const caps, int virDomainCapsDeviceDefValidate(virDomainCapsPtr const caps, const virDomainDeviceDef *dev, - const virDomainDef *def ATTRIBUTE_UNUSED) + const virDomainDef *def G_GNUC_UNUSED) { int ret = 0; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 35a51f1793..6bd2d4935d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4073,8 +4073,8 @@ virDomainDeviceSetData(virDomainDeviceDefPtr device, static int -virDomainDefHasDeviceAddressIterator(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, +virDomainDefHasDeviceAddressIterator(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *opaque) { @@ -5191,8 +5191,8 @@ virDomainVsockDefPostParse(virDomainVsockDefPtr vsock) static int virDomainDeviceDefPostParseCommon(virDomainDeviceDefPtr dev, const virDomainDef *def, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, + virCapsPtr caps G_GNUC_UNUSED, + unsigned int parseFlags G_GNUC_UNUSED, virDomainXMLOptionPtr xmlopt) { int ret = -1; @@ -5509,7 +5509,7 @@ struct virDomainDefPostParseDeviceIteratorData { static int virDomainDefPostParseDeviceIterator(virDomainDefPtr def, virDomainDeviceDefPtr dev, - virDomainDeviceInfoPtr info ATTRIBUTE_UNUSED, + virDomainDeviceInfoPtr info G_GNUC_UNUSED, void *opaque) { struct virDomainDefPostParseDeviceIteratorData *data = opaque; @@ -5579,8 +5579,8 @@ virDomainDefPostParseCPU(virDomainDefPtr def) static int -virDomainDefCollectBootOrder(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, +virDomainDefCollectBootOrder(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *data) { @@ -6612,7 +6612,7 @@ virDomainDeviceDefValidate(const virDomainDeviceDef *dev, static int virDomainDefValidateDeviceIterator(virDomainDefPtr def, virDomainDeviceDefPtr dev, - virDomainDeviceInfoPtr info ATTRIBUTE_UNUSED, + virDomainDeviceInfoPtr info G_GNUC_UNUSED, void *opaque) { struct virDomainDefPostParseDeviceIteratorData *data = opaque; @@ -7461,7 +7461,7 @@ virDomainDeviceAliasIsUserAlias(const char *aliasStr) * @param node XML nodeset to parse for device address definition */ static int -virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt ATTRIBUTE_UNUSED, +virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt G_GNUC_UNUSED, xmlNodePtr node, virDomainDeviceInfoPtr info, unsigned int flags) @@ -8506,7 +8506,7 @@ virDomainNetDefCoalesceFormatXML(virBufferPtr buf, static int -virDomainHostdevDefParseXMLCaps(xmlNodePtr node ATTRIBUTE_UNUSED, +virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED, xmlXPathContextPtr ctxt, const char *type, virDomainHostdevDefPtr def) @@ -29065,8 +29065,8 @@ struct _virDomainCompatibleDeviceData { }; static int -virDomainDeviceInfoCheckBootIndex(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr device ATTRIBUTE_UNUSED, +virDomainDeviceInfoCheckBootIndex(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr device G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *opaque) { @@ -30114,7 +30114,7 @@ typedef struct { } virDomainDefFindDeviceCallbackData; static int -virDomainDefFindDeviceCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, +virDomainDefFindDeviceCallback(virDomainDefPtr def G_GNUC_UNUSED, virDomainDeviceDefPtr dev, virDomainDeviceInfoPtr info, void *opaque) @@ -31034,7 +31034,7 @@ virDomainNetNotifyActualDevice(virConnectPtr conn, int virDomainNetReleaseActualDevice(virConnectPtr conn, - virDomainDefPtr dom ATTRIBUTE_UNUSED, + virDomainDefPtr dom G_GNUC_UNUSED, virDomainNetDefPtr iface) { virNetworkPtr net = NULL; diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 40031a46c8..c0dcf8f716 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -2227,7 +2227,7 @@ virDomainEventStateDeregister(virConnectPtr conn, * event should be dispatched. */ static bool -virDomainQemuMonitorEventFilter(virConnectPtr conn ATTRIBUTE_UNUSED, +virDomainQemuMonitorEventFilter(virConnectPtr conn G_GNUC_UNUSED, virObjectEventPtr event, void *opaque) { diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index beeb760e2d..58a0e32dd7 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -76,7 +76,7 @@ VIR_ENUM_IMPL(virNetworkTaint, static virClassPtr virNetworkXMLOptionClass; static void -virNetworkXMLOptionDispose(void *obj ATTRIBUTE_UNUSED) +virNetworkXMLOptionDispose(void *obj G_GNUC_UNUSED) { return; } @@ -2418,7 +2418,7 @@ virNetworkForwardNatDefFormat(virBufferPtr buf, int virNetworkDefFormatBuf(virBufferPtr buf, const virNetworkDef *def, - virNetworkXMLOptionPtr xmlopt ATTRIBUTE_UNUSED, + virNetworkXMLOptionPtr xmlopt G_GNUC_UNUSED, unsigned int flags) { const unsigned char *uuid; @@ -2812,11 +2812,11 @@ virNetworkDefUpdateCheckElementName(virNetworkDefPtr def, static int virNetworkDefUpdateBridge(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { virNetworkDefUpdateNoSupport(def, "bridge"); return -1; @@ -2825,11 +2825,11 @@ virNetworkDefUpdateBridge(virNetworkDefPtr def, static int virNetworkDefUpdateDomain(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { virNetworkDefUpdateNoSupport(def, "domain"); return -1; @@ -2838,11 +2838,11 @@ virNetworkDefUpdateDomain(virNetworkDefPtr def, static int virNetworkDefUpdateIP(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { virNetworkDefUpdateNoSupport(def, "ip"); return -1; @@ -2919,7 +2919,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, int parentIndex, xmlXPathContextPtr ctxt, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { size_t i; int ret = -1; @@ -3059,7 +3059,7 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, int parentIndex, xmlXPathContextPtr ctxt, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { size_t i; int ret = -1; @@ -3157,11 +3157,11 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, static int virNetworkDefUpdateForward(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { virNetworkDefUpdateNoSupport(def, "forward"); return -1; @@ -3171,10 +3171,10 @@ virNetworkDefUpdateForward(virNetworkDefPtr def, static int virNetworkDefUpdateForwardInterface(virNetworkDefPtr def, unsigned int command, - int parentIndex ATTRIBUTE_UNUSED, + int parentIndex G_GNUC_UNUSED, xmlXPathContextPtr ctxt, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { size_t i; int ret = -1; @@ -3265,11 +3265,11 @@ virNetworkDefUpdateForwardInterface(virNetworkDefPtr def, static int virNetworkDefUpdateForwardPF(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { virNetworkDefUpdateNoSupport(def, "forward pf"); return -1; @@ -3279,10 +3279,10 @@ virNetworkDefUpdateForwardPF(virNetworkDefPtr def, static int virNetworkDefUpdatePortGroup(virNetworkDefPtr def, unsigned int command, - int parentIndex ATTRIBUTE_UNUSED, + int parentIndex G_GNUC_UNUSED, xmlXPathContextPtr ctxt, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { size_t i; int foundName = -1, foundDefault = -1; @@ -3373,11 +3373,11 @@ virNetworkDefUpdatePortGroup(virNetworkDefPtr def, static int virNetworkDefUpdateDNSHost(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { size_t i, j, k; int foundIdx = -1, ret = -1; @@ -3468,11 +3468,11 @@ virNetworkDefUpdateDNSHost(virNetworkDefPtr def, static int virNetworkDefUpdateDNSSrv(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { size_t i; int foundIdx = -1, ret = -1; @@ -3555,11 +3555,11 @@ virNetworkDefUpdateDNSSrv(virNetworkDefPtr def, static int virNetworkDefUpdateDNSTxt(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { int foundIdx, ret = -1; virNetworkDNSDefPtr dns = &def->dns; diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 84fcbd3e78..3aba04c54c 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2619,21 +2619,21 @@ virNodeDeviceGetPCIDynamicCaps(const char *sysfsPath, #else int -virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host ATTRIBUTE_UNUSED) +virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host G_GNUC_UNUSED) { return -1; } int -virNodeDeviceGetPCIDynamicCaps(const char *sysfsPath ATTRIBUTE_UNUSED, - virNodeDevCapPCIDevPtr pci_dev ATTRIBUTE_UNUSED) +virNodeDeviceGetPCIDynamicCaps(const char *sysfsPath G_GNUC_UNUSED, + virNodeDevCapPCIDevPtr pci_dev G_GNUC_UNUSED) { return -1; } -int virNodeDeviceGetSCSITargetCaps(const char *sysfsPath ATTRIBUTE_UNUSED, - virNodeDevCapSCSITargetPtr scsi_target ATTRIBUTE_UNUSED) +int virNodeDeviceGetSCSITargetCaps(const char *sysfsPath G_GNUC_UNUSED, + virNodeDevCapSCSITargetPtr scsi_target G_GNUC_UNUSED) { return -1; } diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index d21eebf19d..6b7a606b64 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -448,8 +448,8 @@ static const struct int_map macProtoMap[] = { static bool checkMacProtocolID(enum attrDatatype datatype, union data *value, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, - nwItemDesc *item ATTRIBUTE_UNUSED) + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, + nwItemDesc *item G_GNUC_UNUSED) { int32_t res = -1; @@ -477,7 +477,7 @@ checkMacProtocolID(enum attrDatatype datatype, static bool macProtocolIDFormatter(virBufferPtr buf, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { const char *str = NULL; bool asHex = true; @@ -500,7 +500,7 @@ static bool checkVlanVlanID(enum attrDatatype datatype, union data *value, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { int32_t res; @@ -522,7 +522,7 @@ static bool checkVlanProtocolID(enum attrDatatype datatype, union data *value, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { int32_t res = -1; @@ -550,7 +550,7 @@ checkVlanProtocolID(enum attrDatatype datatype, static bool vlanProtocolIDFormatter(virBufferPtr buf, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { const char *str = NULL; bool asHex = true; @@ -600,10 +600,10 @@ checkValidMask(unsigned char *data, static bool -checkMACMask(enum attrDatatype datatype ATTRIBUTE_UNUSED, +checkMACMask(enum attrDatatype datatype G_GNUC_UNUSED, union data *macMask, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, - nwItemDesc *item ATTRIBUTE_UNUSED) + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, + nwItemDesc *item G_GNUC_UNUSED) { return checkValidMask(macMask->uc, 6); } @@ -630,7 +630,7 @@ static bool arpOpcodeValidator(enum attrDatatype datatype, union data *value, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { int32_t res = -1; @@ -655,7 +655,7 @@ arpOpcodeValidator(enum attrDatatype datatype, static bool arpOpcodeFormatter(virBufferPtr buf, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { const char *str = NULL; @@ -692,7 +692,7 @@ static bool checkIPProtocolID(enum attrDatatype datatype, union data *value, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { int32_t res = -1; @@ -717,7 +717,7 @@ checkIPProtocolID(enum attrDatatype datatype, static bool formatIPProtocolID(virBufferPtr buf, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { const char *str = NULL; bool asHex = true; @@ -740,7 +740,7 @@ static bool dscpValidator(enum attrDatatype datatype, union data *val, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { uint8_t dscp = val->ui; if (dscp > 63) @@ -857,7 +857,7 @@ virNWFilterPrintStateMatchFlags(virBufferPtr buf, static bool -stateValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, +stateValidator(enum attrDatatype datatype G_GNUC_UNUSED, union data *val, virNWFilterRuleDefPtr nwf, nwItemDesc *item) @@ -879,7 +879,7 @@ stateValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, static bool stateFormatter(virBufferPtr buf, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { virNWFilterPrintStateMatchFlags(buf, "", item->u.u16, true); @@ -902,9 +902,9 @@ static const struct int_map tcpFlags[] = { static bool -tcpFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, +tcpFlagsValidator(enum attrDatatype datatype G_GNUC_UNUSED, union data *val, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { bool rc = false; @@ -959,7 +959,7 @@ virNWFilterPrintTCPFlags(uint8_t flags) static bool tcpFlagsFormatter(virBufferPtr buf, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { printTCPFlags(buf, item->u.tcpFlags.mask); @@ -971,9 +971,9 @@ tcpFlagsFormatter(virBufferPtr buf, static bool -ipsetValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, +ipsetValidator(enum attrDatatype datatype G_GNUC_UNUSED, union data *val, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { const char *errmsg = NULL; @@ -1000,7 +1000,7 @@ ipsetValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, static bool ipsetFormatter(virBufferPtr buf, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { virBufferAdd(buf, item->u.ipset.setname, -1); @@ -1010,9 +1010,9 @@ ipsetFormatter(virBufferPtr buf, static bool -ipsetFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, +ipsetFlagsValidator(enum attrDatatype datatype G_GNUC_UNUSED, union data *val, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { const char *errmsg = NULL; @@ -1050,7 +1050,7 @@ ipsetFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, static bool ipsetFlagsFormatter(virBufferPtr buf, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { uint8_t ctr; diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 4b85f22950..7640717948 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -623,7 +623,7 @@ virNWFilterVarCombIterGetVarValue(virNWFilterVarCombIterPtr ci, } static void -hashDataFree(void *payload, const void *name ATTRIBUTE_UNUSED) +hashDataFree(void *payload, const void *name G_GNUC_UNUSED) { virNWFilterVarValueFree(payload); } diff --git a/src/conf/object_event.c b/src/conf/object_event.c index a50a09e1a0..453fab74b1 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -543,7 +543,7 @@ static void virObjectEventStateFlush(virObjectEventStatePtr state); * flush the callback queue. */ static void -virObjectEventTimer(int timer ATTRIBUTE_UNUSED, void *opaque) +virObjectEventTimer(int timer G_GNUC_UNUSED, void *opaque) { virObjectEventStatePtr state = opaque; diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 5090a67a4f..59d4864735 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -195,12 +195,12 @@ static void virChrdevLockFileRemove(const char *dev) } #else /* #ifdef VIR_CHRDEV_LOCK_FILE_PATH */ /* file locking for character devices is disabled */ -static int virChrdevLockFileCreate(const char *dev ATTRIBUTE_UNUSED) +static int virChrdevLockFileCreate(const char *dev G_GNUC_UNUSED) { return 0; } -static void virChrdevLockFileRemove(const char *dev ATTRIBUTE_UNUSED) +static void virChrdevLockFileRemove(const char *dev G_GNUC_UNUSED) { return; } @@ -245,7 +245,7 @@ static void virChrdevFDStreamCloseCbFree(void *opaque) * @st Pointer to stream being closed. * @opaque Domain's device information structure. */ -static void virChrdevFDStreamCloseCb(virStreamPtr st ATTRIBUTE_UNUSED, +static void virChrdevFDStreamCloseCb(virStreamPtr st G_GNUC_UNUSED, void *opaque) { virChrdevStreamInfoPtr priv = opaque; @@ -291,8 +291,8 @@ virChrdevsPtr virChrdevAlloc(void) * Helper to clear stream callbacks when freeing the hash */ static int virChrdevFreeClearCallbacks(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *data ATTRIBUTE_UNUSED) + const void *name G_GNUC_UNUSED, + void *data G_GNUC_UNUSED) { virStreamPtr st = payload; diff --git a/src/conf/virdomaincheckpointobjlist.c b/src/conf/virdomaincheckpointobjlist.c index 03aad9f5ef..41181477f4 100644 --- a/src/conf/virdomaincheckpointobjlist.c +++ b/src/conf/virdomaincheckpointobjlist.c @@ -48,7 +48,7 @@ virDomainCheckpointAssignDef(virDomainCheckpointObjListPtr checkpoints, static bool -virDomainCheckpointFilter(virDomainMomentObjPtr obj ATTRIBUTE_UNUSED, +virDomainCheckpointFilter(virDomainMomentObjPtr obj G_GNUC_UNUSED, unsigned int flags) { /* For now, we have no further filters than what the common code handles. */ diff --git a/src/conf/virdomainmomentobjlist.c b/src/conf/virdomainmomentobjlist.c index d02efb420a..a4f9ce9c3f 100644 --- a/src/conf/virdomainmomentobjlist.c +++ b/src/conf/virdomainmomentobjlist.c @@ -263,7 +263,7 @@ virDomainMomentAssignDef(virDomainMomentObjListPtr moments, static void virDomainMomentObjListDataFree(void *payload, - const void *name ATTRIBUTE_UNUSED) + const void *name G_GNUC_UNUSED) { virDomainMomentObjPtr obj = payload; @@ -310,7 +310,7 @@ struct virDomainMomentNameData { static int virDomainMomentObjListCopyNames(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virDomainMomentObjPtr obj = payload; @@ -497,7 +497,7 @@ struct moment_set_relation { }; static int virDomainMomentSetRelations(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *data) { virDomainMomentObjPtr obj = payload; diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 2eff6768c2..fa1985f474 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -95,7 +95,7 @@ static void virDomainObjListDispose(void *obj) static int virDomainObjListSearchID(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *data) { virDomainObjPtr obj = (virDomainObjPtr)payload; @@ -655,7 +655,7 @@ struct virDomainObjListData { static int virDomainObjListCount(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virDomainObjPtr obj = payload; @@ -702,7 +702,7 @@ struct virDomainIDData { static int virDomainObjListCopyActiveIDs(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virDomainObjPtr obj = payload; @@ -747,7 +747,7 @@ struct virDomainNameData { static int virDomainObjListCopyInactiveNames(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virDomainObjPtr obj = payload; @@ -804,7 +804,7 @@ struct virDomainListIterData { static int virDomainObjListHelper(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virDomainListIterData *data = opaque; @@ -932,7 +932,7 @@ struct virDomainListData { static int virDomainObjListCollectIterator(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virDomainListData *data = opaque; diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index c8d931a4b6..b77d4152f5 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -161,7 +161,7 @@ struct _virInterfaceObjFindMACData { static int virInterfaceObjListFindByMACStringCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virInterfaceObjPtr obj = payload; @@ -273,7 +273,7 @@ struct _virInterfaceObjListExportData { static int virInterfaceObjListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virInterfaceObjListExportDataPtr data = opaque; @@ -366,7 +366,7 @@ struct _virInterfaceObjListCloneData { static int virInterfaceObjListCloneCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virInterfaceObjPtr srcObj = payload; @@ -485,7 +485,7 @@ struct _virInterfaceObjNumOfInterfacesData { static int virInterfaceObjListNumOfInterfacesCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virInterfaceObjPtr obj = payload; @@ -527,7 +527,7 @@ struct _virInterfaceObjGetNamesData { static int virInterfaceObjListGetNamesCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virInterfaceObjPtr obj = payload; diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 69a962b466..966956e719 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -94,7 +94,7 @@ virNetworkObjLoadAllPorts(virNetworkObjPtr net, static void -virNetworkObjPortFree(void *val, const void *key ATTRIBUTE_UNUSED) +virNetworkObjPortFree(void *val, const void *key G_GNUC_UNUSED) { virNetworkPortDefFree(val); } @@ -404,7 +404,7 @@ virNetworkObjFindByUUID(virNetworkObjListPtr nets, static int virNetworkObjSearchName(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *data) { virNetworkObjPtr obj = (virNetworkObjPtr) payload; @@ -1190,7 +1190,7 @@ struct virNetworkObjBridgeInUseHelperData { static int virNetworkObjBridgeInUseHelper(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { int ret; @@ -1367,7 +1367,7 @@ struct _virNetworkObjListExportData { static int virNetworkObjListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNetworkObjListExportDataPtr data = opaque; @@ -1451,7 +1451,7 @@ struct virNetworkObjListForEachHelperData { static int virNetworkObjListForEachHelper(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virNetworkObjListForEachHelperData *data = opaque; @@ -1501,7 +1501,7 @@ struct virNetworkObjListGetHelperData { static int virNetworkObjListGetHelper(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virNetworkObjListGetHelperData *data = opaque; @@ -1591,7 +1591,7 @@ struct virNetworkObjListPruneHelperData { static int virNetworkObjListPruneHelper(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { const struct virNetworkObjListPruneHelperData *data = opaque; @@ -1773,7 +1773,7 @@ struct _virNetworkObjPortListExportData { static int virNetworkObjPortListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNetworkObjPortListExportDataPtr data = opaque; @@ -1853,7 +1853,7 @@ struct _virNetworkObjPortListForEachData { static int virNetworkObjPortForEachCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNetworkObjPortListForEachData *data = opaque; diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 37d9de478f..7656a5eed2 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -199,7 +199,7 @@ virNodeDeviceObjListSearch(virNodeDeviceObjListPtr devs, static int virNodeDeviceObjListFindBySysfsPathCallback(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virNodeDeviceObjPtr obj = (virNodeDeviceObjPtr) payload; @@ -256,7 +256,7 @@ struct virNodeDeviceObjListFindByWWNsData { static int virNodeDeviceObjListFindByWWNsCallback(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virNodeDeviceObjPtr obj = (virNodeDeviceObjPtr) payload; @@ -292,7 +292,7 @@ virNodeDeviceObjListFindByWWNs(virNodeDeviceObjListPtr devs, static int virNodeDeviceObjListFindByFabricWWNCallback(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virNodeDeviceObjPtr obj = (virNodeDeviceObjPtr) payload; @@ -322,7 +322,7 @@ virNodeDeviceObjListFindByFabricWWN(virNodeDeviceObjListPtr devs, static int virNodeDeviceObjListFindByCapCallback(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virNodeDeviceObjPtr obj = (virNodeDeviceObjPtr) payload; @@ -354,7 +354,7 @@ struct virNodeDeviceObjListFindSCSIHostByWWNsData { static int virNodeDeviceObjListFindSCSIHostByWWNsCallback(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virNodeDeviceObjPtr obj = (virNodeDeviceObjPtr) payload; @@ -694,7 +694,7 @@ struct virNodeDeviceCountData { static int virNodeDeviceObjListNumOfDevicesCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNodeDeviceObjPtr obj = payload; @@ -742,7 +742,7 @@ struct virNodeDeviceGetNamesData { static int virNodeDeviceObjListGetNamesCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNodeDeviceObjPtr obj = payload; @@ -852,7 +852,7 @@ struct _virNodeDeviceObjListExportData { static int virNodeDeviceObjListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNodeDeviceObjPtr obj = payload; diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c index 9fe62ed4ed..97e4d3c49b 100644 --- a/src/conf/virnwfilterbindingobjlist.c +++ b/src/conf/virnwfilterbindingobjlist.c @@ -345,7 +345,7 @@ struct virNWFilterBindingListIterData { static int virNWFilterBindingObjListHelper(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virNWFilterBindingListIterData *data = opaque; @@ -379,7 +379,7 @@ struct virNWFilterBindingListData { static int virNWFilterBindingObjListCollectIterator(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virNWFilterBindingListData *data = opaque; diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 5bd84d82ed..f9f222dcd3 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -197,7 +197,7 @@ virSecretObjListFindByUUID(virSecretObjListPtr secrets, static int virSecretObjSearchName(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virSecretObjPtr obj = (virSecretObjPtr) payload; @@ -410,7 +410,7 @@ struct virSecretCountData { static int virSecretObjListNumOfSecretsCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virSecretCountData *data = opaque; @@ -443,7 +443,7 @@ struct virSecretListData { static int virSecretObjListGetUUIDsCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virSecretListData *data = opaque; @@ -537,7 +537,7 @@ struct _virSecretObjListExportData { static int virSecretObjListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virSecretObjListExportDataPtr data = opaque; diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 286192172d..664dc12776 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -421,7 +421,7 @@ struct _virStoragePoolObjListForEachData { static int virStoragePoolObjListForEachCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStoragePoolObjPtr obj = payload; @@ -477,7 +477,7 @@ struct _virStoragePoolObjListSearchData { static int virStoragePoolObjListSearchCb(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virStoragePoolObjPtr obj = (virStoragePoolObjPtr) payload; @@ -728,7 +728,7 @@ struct _virStoragePoolObjForEachVolData { static int virStoragePoolObjForEachVolumeCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { int ret = 0; @@ -767,7 +767,7 @@ struct _virStoragePoolObjSearchVolData { static int virStoragePoolObjSearchVolumeCb(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virStorageVolObjPtr volobj = (virStorageVolObjPtr) payload; @@ -864,7 +864,7 @@ struct _virStorageVolObjCountData { static int virStoragePoolObjNumOfVolumesCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStorageVolObjPtr volobj = payload; @@ -913,7 +913,7 @@ struct _virStorageVolObjNameData { static int virStoragePoolObjVolumeGetNamesCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStorageVolObjPtr volobj = payload; @@ -987,7 +987,7 @@ struct _virStoragePoolObjVolumeListExportData { static int virStoragePoolObjVolumeListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStorageVolObjPtr volobj = payload; @@ -1437,7 +1437,7 @@ struct _virStoragePoolObjFindDuplicateData { static int virStoragePoolObjSourceFindDuplicateCb(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virStoragePoolObjPtr obj = (virStoragePoolObjPtr) payload; @@ -1847,7 +1847,7 @@ struct _virStoragePoolCountData { static int virStoragePoolObjNumOfStoragePoolsCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStoragePoolObjPtr obj = payload; @@ -1899,7 +1899,7 @@ struct _virStoragePoolNameData { static int virStoragePoolObjGetNamesCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStoragePoolObjPtr obj = payload; @@ -2046,7 +2046,7 @@ struct _virStoragePoolObjListExportData { static int virStoragePoolObjListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStoragePoolObjPtr obj = payload; -- 2.19.2

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/esx/esx_driver.c | 32 ++++++++++++++--------------- src/esx/esx_interface_driver.c | 10 ++++----- src/esx/esx_network_driver.c | 16 +++++++-------- src/esx/esx_storage_backend_iscsi.c | 16 +++++++-------- src/esx/esx_storage_driver.c | 16 +++++++-------- src/esx/esx_vi.c | 20 +++++++++--------- src/esx/esx_vi_types.c | 4 ++-- 7 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index d6d219c101..b7c80d5c43 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -825,7 +825,7 @@ esxConnectToVCenter(esxPrivate *priv, */ static virDrvOpenStatus esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, - virConfPtr conf ATTRIBUTE_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { virDrvOpenStatus result = VIR_DRV_OPEN_ERROR; @@ -1097,7 +1097,7 @@ esxConnectSupportsFeature(virConnectPtr conn, int feature) static const char * -esxConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) +esxConnectGetType(virConnectPtr conn G_GNUC_UNUSED) { return "ESX"; } @@ -1852,7 +1852,7 @@ esxDomainDestroy(virDomainPtr dom) static char * -esxDomainGetOSType(virDomainPtr domain ATTRIBUTE_UNUSED) +esxDomainGetOSType(virDomainPtr domain G_GNUC_UNUSED) { char *osType; @@ -3450,7 +3450,7 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart) * SharesLevel 'low', 'normal' and 'high'. */ static char * -esxDomainGetSchedulerType(virDomainPtr domain ATTRIBUTE_UNUSED, int *nparams) +esxDomainGetSchedulerType(virDomainPtr domain G_GNUC_UNUSED, int *nparams) { char *type; @@ -3736,13 +3736,13 @@ esxDomainSetSchedulerParameters(virDomainPtr domain, static int esxDomainMigratePrepare(virConnectPtr dconn, - char **cookie ATTRIBUTE_UNUSED, - int *cookielen ATTRIBUTE_UNUSED, - const char *uri_in ATTRIBUTE_UNUSED, + char **cookie G_GNUC_UNUSED, + int *cookielen G_GNUC_UNUSED, + const char *uri_in G_GNUC_UNUSED, char **uri_out, unsigned long flags, - const char *dname ATTRIBUTE_UNUSED, - unsigned long resource ATTRIBUTE_UNUSED) + const char *dname G_GNUC_UNUSED, + unsigned long resource G_GNUC_UNUSED) { esxPrivate *priv = dconn->privateData; @@ -3763,12 +3763,12 @@ esxDomainMigratePrepare(virConnectPtr dconn, static int esxDomainMigratePerform(virDomainPtr domain, - const char *cookie ATTRIBUTE_UNUSED, - int cookielen ATTRIBUTE_UNUSED, + const char *cookie G_GNUC_UNUSED, + int cookielen G_GNUC_UNUSED, const char *uri, unsigned long flags, const char *dname, - unsigned long bandwidth ATTRIBUTE_UNUSED) + unsigned long bandwidth G_GNUC_UNUSED) { int result = -1; esxPrivate *priv = domain->conn->privateData; @@ -3906,9 +3906,9 @@ esxDomainMigratePerform(virDomainPtr domain, static virDomainPtr esxDomainMigrateFinish(virConnectPtr dconn, const char *dname, - const char *cookie ATTRIBUTE_UNUSED, - int cookielen ATTRIBUTE_UNUSED, - const char *uri ATTRIBUTE_UNUSED, + const char *cookie G_GNUC_UNUSED, + int cookielen G_GNUC_UNUSED, + const char *uri G_GNUC_UNUSED, unsigned long flags) { virCheckFlags(ESX_MIGRATION_FLAGS, NULL); @@ -4060,7 +4060,7 @@ esxDomainIsPersistent(virDomainPtr domain) static int -esxDomainIsUpdated(virDomainPtr domain ATTRIBUTE_UNUSED) +esxDomainIsUpdated(virDomainPtr domain G_GNUC_UNUSED) { /* ESX domains never have a persistent state that differs from * current state. However, we do want to check for existence. */ diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index e3b41164e7..76dcb3d53c 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -107,7 +107,7 @@ esxConnectListInterfaces(virConnectPtr conn, char **const names, int maxnames) static int -esxConnectNumOfDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED) +esxConnectNumOfDefinedInterfaces(virConnectPtr conn G_GNUC_UNUSED) { /* ESX interfaces are always active */ return 0; @@ -116,9 +116,9 @@ esxConnectNumOfDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED) static int -esxConnectListDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED, - char **const names ATTRIBUTE_UNUSED, - int maxnames ATTRIBUTE_UNUSED) +esxConnectListDefinedInterfaces(virConnectPtr conn G_GNUC_UNUSED, + char **const names G_GNUC_UNUSED, + int maxnames G_GNUC_UNUSED) { /* ESX interfaces are always active */ return 0; @@ -250,7 +250,7 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) static int -esxInterfaceIsActive(virInterfacePtr iface ATTRIBUTE_UNUSED) +esxInterfaceIsActive(virInterfacePtr iface G_GNUC_UNUSED) { /* ESX interfaces are always active */ return 1; diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 40bd5c2168..aaf6c77635 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -115,7 +115,7 @@ esxConnectListNetworks(virConnectPtr conn, char **const names, int maxnames) static int -esxConnectNumOfDefinedNetworks(virConnectPtr conn ATTRIBUTE_UNUSED) +esxConnectNumOfDefinedNetworks(virConnectPtr conn G_GNUC_UNUSED) { /* ESX networks are always active */ return 0; @@ -124,9 +124,9 @@ esxConnectNumOfDefinedNetworks(virConnectPtr conn ATTRIBUTE_UNUSED) static int -esxConnectListDefinedNetworks(virConnectPtr conn ATTRIBUTE_UNUSED, - char **const names ATTRIBUTE_UNUSED, - int maxnames ATTRIBUTE_UNUSED) +esxConnectListDefinedNetworks(virConnectPtr conn G_GNUC_UNUSED, + char **const names G_GNUC_UNUSED, + int maxnames G_GNUC_UNUSED) { /* ESX networks are always active */ return 0; @@ -823,7 +823,7 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) static int -esxNetworkGetAutostart(virNetworkPtr network ATTRIBUTE_UNUSED, +esxNetworkGetAutostart(virNetworkPtr network G_GNUC_UNUSED, int *autostart) { /* ESX networks are always active */ @@ -835,7 +835,7 @@ esxNetworkGetAutostart(virNetworkPtr network ATTRIBUTE_UNUSED, static int -esxNetworkSetAutostart(virNetworkPtr network ATTRIBUTE_UNUSED, +esxNetworkSetAutostart(virNetworkPtr network G_GNUC_UNUSED, int autostart) { /* Just accept autostart activation, but fail on autostart deactivation */ @@ -853,7 +853,7 @@ esxNetworkSetAutostart(virNetworkPtr network ATTRIBUTE_UNUSED, static int -esxNetworkIsActive(virNetworkPtr network ATTRIBUTE_UNUSED) +esxNetworkIsActive(virNetworkPtr network G_GNUC_UNUSED) { /* ESX networks are always active */ return 1; @@ -862,7 +862,7 @@ esxNetworkIsActive(virNetworkPtr network ATTRIBUTE_UNUSED) static int -esxNetworkIsPersistent(virNetworkPtr network ATTRIBUTE_UNUSED) +esxNetworkIsPersistent(virNetworkPtr network G_GNUC_UNUSED) { /* ESX has no concept of transient networks, so all of them are persistent */ return 1; diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c index 49edf70284..e9a30876bf 100644 --- a/src/esx/esx_storage_backend_iscsi.c +++ b/src/esx/esx_storage_backend_iscsi.c @@ -276,7 +276,7 @@ esxStoragePoolRefresh(virStoragePoolPtr pool, static int -esxStoragePoolGetInfo(virStoragePoolPtr pool ATTRIBUTE_UNUSED, +esxStoragePoolGetInfo(virStoragePoolPtr pool G_GNUC_UNUSED, virStoragePoolInfoPtr info) { /* These fields are not valid for iSCSI pool */ @@ -582,8 +582,8 @@ esxStorageVolLookupByKey(virConnectPtr conn, const char *key) static virStorageVolPtr -esxStorageVolCreateXML(virStoragePoolPtr pool ATTRIBUTE_UNUSED, - const char *xmldesc ATTRIBUTE_UNUSED, +esxStorageVolCreateXML(virStoragePoolPtr pool G_GNUC_UNUSED, + const char *xmldesc G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(0, NULL); @@ -597,9 +597,9 @@ esxStorageVolCreateXML(virStoragePoolPtr pool ATTRIBUTE_UNUSED, static virStorageVolPtr -esxStorageVolCreateXMLFrom(virStoragePoolPtr pool ATTRIBUTE_UNUSED, - const char *xmldesc ATTRIBUTE_UNUSED, - virStorageVolPtr sourceVolume ATTRIBUTE_UNUSED, +esxStorageVolCreateXMLFrom(virStoragePoolPtr pool G_GNUC_UNUSED, + const char *xmldesc G_GNUC_UNUSED, + virStorageVolPtr sourceVolume G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(0, NULL); @@ -733,7 +733,7 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume, static int -esxStorageVolDelete(virStorageVolPtr volume ATTRIBUTE_UNUSED, +esxStorageVolDelete(virStorageVolPtr volume G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(0, -1); @@ -747,7 +747,7 @@ esxStorageVolDelete(virStorageVolPtr volume ATTRIBUTE_UNUSED, static int -esxStorageVolWipe(virStorageVolPtr volume ATTRIBUTE_UNUSED, +esxStorageVolWipe(virStorageVolPtr volume G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(0, -1); diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index e692e8644d..8a34732b45 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -117,7 +117,7 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, int maxnames) static int -esxConnectNumOfDefinedStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED) +esxConnectNumOfDefinedStoragePools(virConnectPtr conn G_GNUC_UNUSED) { /* ESX storage pools are always active */ return 0; @@ -126,9 +126,9 @@ esxConnectNumOfDefinedStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED) static int -esxConnectListDefinedStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED, - char **const names ATTRIBUTE_UNUSED, - int maxnames ATTRIBUTE_UNUSED) +esxConnectListDefinedStoragePools(virConnectPtr conn G_GNUC_UNUSED, + char **const names G_GNUC_UNUSED, + int maxnames G_GNUC_UNUSED) { /* ESX storage pools are always active */ return 0; @@ -251,7 +251,7 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) static int -esxStoragePoolGetAutostart(virStoragePoolPtr pool ATTRIBUTE_UNUSED, +esxStoragePoolGetAutostart(virStoragePoolPtr pool G_GNUC_UNUSED, int *autostart) { /* ESX storage pools are always active */ @@ -263,7 +263,7 @@ esxStoragePoolGetAutostart(virStoragePoolPtr pool ATTRIBUTE_UNUSED, static int -esxStoragePoolSetAutostart(virStoragePoolPtr pool ATTRIBUTE_UNUSED, +esxStoragePoolSetAutostart(virStoragePoolPtr pool G_GNUC_UNUSED, int autostart) { /* Just accept autostart activation, but fail on autostart deactivation */ @@ -500,7 +500,7 @@ esxStorageVolGetPath(virStorageVolPtr volume) static int -esxStoragePoolIsActive(virStoragePoolPtr pool ATTRIBUTE_UNUSED) +esxStoragePoolIsActive(virStoragePoolPtr pool G_GNUC_UNUSED) { /* ESX storage pools are always active */ return 1; @@ -509,7 +509,7 @@ esxStoragePoolIsActive(virStoragePoolPtr pool ATTRIBUTE_UNUSED) static int -esxStoragePoolIsPersistent(virStoragePoolPtr pool ATTRIBUTE_UNUSED) +esxStoragePoolIsPersistent(virStoragePoolPtr pool G_GNUC_UNUSED) { /* ESX has no concept of transient pools, so all of them are persistent */ return 1; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 7e8a174313..fc21a7b6eb 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -64,7 +64,7 @@ VIR_LOG_INIT("esx.esx_vi"); void \ esxVI_##_type##_Free(esxVI_##_type **ptrptr) \ { \ - esxVI_##_type *item ATTRIBUTE_UNUSED; \ + esxVI_##_type *item G_GNUC_UNUSED; \ \ if (!ptrptr || !(*ptrptr)) { \ return; \ @@ -167,8 +167,8 @@ esxVI_CURL_WriteBuffer(char *data, size_t size, size_t nmemb, void *userdata) #if ESX_VI__CURL__ENABLE_DEBUG_OUTPUT static int -esxVI_CURL_Debug(CURL *curl ATTRIBUTE_UNUSED, curl_infotype type, - char *info, size_t size, void *userdata ATTRIBUTE_UNUSED) +esxVI_CURL_Debug(CURL *curl G_GNUC_UNUSED, curl_infotype type, + char *info, size_t size, void *userdata G_GNUC_UNUSED) { char *buffer = NULL; @@ -475,8 +475,8 @@ esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, const char *content) */ static void -esxVI_SharedCURL_Lock(CURL *handle ATTRIBUTE_UNUSED, curl_lock_data data, - curl_lock_access access_ ATTRIBUTE_UNUSED, void *userptr) +esxVI_SharedCURL_Lock(CURL *handle G_GNUC_UNUSED, curl_lock_data data, + curl_lock_access access_ G_GNUC_UNUSED, void *userptr) { size_t i; esxVI_SharedCURL *shared = userptr; @@ -503,7 +503,7 @@ esxVI_SharedCURL_Lock(CURL *handle ATTRIBUTE_UNUSED, curl_lock_data data, } static void -esxVI_SharedCURL_Unlock(CURL *handle ATTRIBUTE_UNUSED, curl_lock_data data, +esxVI_SharedCURL_Unlock(CURL *handle G_GNUC_UNUSED, curl_lock_data data, void *userptr) { size_t i; @@ -649,10 +649,10 @@ esxVI_SharedCURL_Remove(esxVI_SharedCURL *shared, esxVI_CURL *curl) #if ESX_EMULATE_CURL_MULTI_WAIT static int -esxVI_MultiCURL_SocketCallback(CURL *handle ATTRIBUTE_UNUSED, +esxVI_MultiCURL_SocketCallback(CURL *handle G_GNUC_UNUSED, curl_socket_t fd, int action, void *callback_opaque, - void *socket_opaque ATTRIBUTE_UNUSED) + void *socket_opaque G_GNUC_UNUSED) { esxVI_MultiCURL *multi = callback_opaque; size_t i; @@ -695,8 +695,8 @@ esxVI_MultiCURL_SocketCallback(CURL *handle ATTRIBUTE_UNUSED, } static int -esxVI_MultiCURL_TimerCallback(CURLM *handle ATTRIBUTE_UNUSED, - long timeout_ms ATTRIBUTE_UNUSED, +esxVI_MultiCURL_TimerCallback(CURLM *handle G_GNUC_UNUSED, + long timeout_ms G_GNUC_UNUSED, void *callback_opaque) { esxVI_MultiCURL *multi = callback_opaque; diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index c77e759de2..deb6ebd09f 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -58,7 +58,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); void \ esxVI_##_type##_Free(esxVI_##_type **ptrptr) \ { \ - esxVI_##_type *item ATTRIBUTE_UNUSED; \ + esxVI_##_type *item G_GNUC_UNUSED; \ \ if (!ptrptr || !(*ptrptr)) { \ return; \ @@ -185,7 +185,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); esxVI_##_type##_Cast##_dest_extra##FromAnyType(esxVI_AnyType *anyType, \ _dest_type **ptrptr) \ { \ - _dest_type *item ATTRIBUTE_UNUSED; \ + _dest_type *item G_GNUC_UNUSED; \ \ if (!anyType || !ptrptr || *ptrptr) { \ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", \ -- 2.19.2

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/locking/lock_daemon.c | 20 ++++++------- src/locking/lock_daemon_config.c | 2 +- src/locking/lock_daemon_dispatch.c | 32 ++++++++++---------- src/locking/lock_driver_lockd.c | 8 ++--- src/locking/lock_driver_nop.c | 48 +++++++++++++++--------------- src/locking/lock_driver_sanlock.c | 10 +++---- src/locking/lock_manager.c | 10 +++---- src/locking/sanlock_helper.c | 6 ++-- 8 files changed, 68 insertions(+), 68 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index c12cb4ea0f..59167d7d31 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -140,7 +140,7 @@ virLockDaemonUnlock(virLockDaemonPtr lockd) } static void virLockDaemonLockSpaceDataFree(void *data, - const void *key ATTRIBUTE_UNUSED) + const void *key G_GNUC_UNUSED) { virLockSpaceFree(data); } @@ -209,7 +209,7 @@ virLockDaemonNew(virLockDaemonConfigPtr config, bool privileged) static virNetServerPtr -virLockDaemonNewServerPostExecRestart(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, +virLockDaemonNewServerPostExecRestart(virNetDaemonPtr dmn G_GNUC_UNUSED, const char *name, virJSONValuePtr object, void *opaque) @@ -481,8 +481,8 @@ virLockDaemonUnixSocketPaths(bool privileged, static void -virLockDaemonErrorHandler(void *opaque ATTRIBUTE_UNUSED, - virErrorPtr err ATTRIBUTE_UNUSED) +virLockDaemonErrorHandler(void *opaque G_GNUC_UNUSED, + virErrorPtr err G_GNUC_UNUSED) { /* Don't do anything, since logging infrastructure already * took care of reporting the error */ @@ -552,16 +552,16 @@ virLockDaemonVersion(const char *argv0) static void virLockDaemonShutdownHandler(virNetDaemonPtr dmn, - siginfo_t *sig ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + siginfo_t *sig G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { virNetDaemonQuit(dmn); } static void virLockDaemonExecRestartHandler(virNetDaemonPtr dmn, - siginfo_t *sig ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + siginfo_t *sig G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { execRestart = true; virNetDaemonQuit(dmn); @@ -590,7 +590,7 @@ struct virLockDaemonClientReleaseData { static int virLockDaemonClientReleaseLockspace(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virLockSpacePtr lockspace = payload; @@ -781,7 +781,7 @@ virLockDaemonClientNewPostExecRestart(virNetServerClientPtr client, static virJSONValuePtr -virLockDaemonClientPreExecRestart(virNetServerClientPtr client ATTRIBUTE_UNUSED, +virLockDaemonClientPreExecRestart(virNetServerClientPtr client G_GNUC_UNUSED, void *opaque) { virLockDaemonClientPtr priv = opaque; diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c index 8df7cf89cd..f77d6c9017 100644 --- a/src/locking/lock_daemon_config.c +++ b/src/locking/lock_daemon_config.c @@ -62,7 +62,7 @@ virLockDaemonConfigFilePath(bool privileged, char **configfile) virLockDaemonConfigPtr -virLockDaemonConfigNew(bool privileged ATTRIBUTE_UNUSED) +virLockDaemonConfigNew(bool privileged G_GNUC_UNUSED) { virLockDaemonConfigPtr data; diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_dispatch.c index 7f3c806220..d68fd9cf01 100644 --- a/src/locking/lock_daemon_dispatch.c +++ b/src/locking/lock_daemon_dispatch.c @@ -36,9 +36,9 @@ VIR_LOG_INIT("locking.lock_daemon_dispatch"); #include "lock_daemon_dispatch_stubs.h" static int -virLockSpaceProtocolDispatchAcquireResource(virNetServerPtr server ATTRIBUTE_UNUSED, +virLockSpaceProtocolDispatchAcquireResource(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, virLockSpaceProtocolAcquireResourceArgs *args) { @@ -96,9 +96,9 @@ virLockSpaceProtocolDispatchAcquireResource(virNetServerPtr server ATTRIBUTE_UNU static int -virLockSpaceProtocolDispatchCreateResource(virNetServerPtr server ATTRIBUTE_UNUSED, +virLockSpaceProtocolDispatchCreateResource(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, virLockSpaceProtocolCreateResourceArgs *args) { @@ -145,9 +145,9 @@ virLockSpaceProtocolDispatchCreateResource(virNetServerPtr server ATTRIBUTE_UNUS static int -virLockSpaceProtocolDispatchDeleteResource(virNetServerPtr server ATTRIBUTE_UNUSED, +virLockSpaceProtocolDispatchDeleteResource(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, virLockSpaceProtocolDeleteResourceArgs *args) { @@ -194,9 +194,9 @@ virLockSpaceProtocolDispatchDeleteResource(virNetServerPtr server ATTRIBUTE_UNUS static int -virLockSpaceProtocolDispatchNew(virNetServerPtr server ATTRIBUTE_UNUSED, +virLockSpaceProtocolDispatchNew(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, virLockSpaceProtocolNewArgs *args) { @@ -250,9 +250,9 @@ virLockSpaceProtocolDispatchNew(virNetServerPtr server ATTRIBUTE_UNUSED, static int -virLockSpaceProtocolDispatchRegister(virNetServerPtr server ATTRIBUTE_UNUSED, +virLockSpaceProtocolDispatchRegister(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, virLockSpaceProtocolRegisterArgs *args) { @@ -296,9 +296,9 @@ virLockSpaceProtocolDispatchRegister(virNetServerPtr server ATTRIBUTE_UNUSED, static int -virLockSpaceProtocolDispatchReleaseResource(virNetServerPtr server ATTRIBUTE_UNUSED, +virLockSpaceProtocolDispatchReleaseResource(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, virLockSpaceProtocolReleaseResourceArgs *args) { @@ -347,9 +347,9 @@ virLockSpaceProtocolDispatchReleaseResource(virNetServerPtr server ATTRIBUTE_UNU static int -virLockSpaceProtocolDispatchRestrict(virNetServerPtr server ATTRIBUTE_UNUSED, +virLockSpaceProtocolDispatchRestrict(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, virLockSpaceProtocolRestrictArgs *args) { @@ -386,9 +386,9 @@ virLockSpaceProtocolDispatchRestrict(virNetServerPtr server ATTRIBUTE_UNUSED, static int -virLockSpaceProtocolDispatchCreateLockSpace(virNetServerPtr server ATTRIBUTE_UNUSED, +virLockSpaceProtocolDispatchCreateLockSpace(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, virLockSpaceProtocolCreateLockSpaceArgs *args) { diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 67f512a64e..b29a1da48f 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -174,7 +174,7 @@ virLockManagerLockDaemonConnectionRegister(virLockManagerPtr lock, static int -virLockManagerLockDaemonConnectionRestrict(virLockManagerPtr lock ATTRIBUTE_UNUSED, +virLockManagerLockDaemonConnectionRestrict(virLockManagerPtr lock G_GNUC_UNUSED, virNetClientPtr client, virNetClientProgramPtr program, int *counter) @@ -621,9 +621,9 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock, static int virLockManagerLockDaemonAcquire(virLockManagerPtr lock, - const char *state ATTRIBUTE_UNUSED, + const char *state G_GNUC_UNUSED, unsigned int flags, - virDomainLockFailureAction action ATTRIBUTE_UNUSED, + virDomainLockFailureAction action G_GNUC_UNUSED, int *fd) { virNetClientPtr client = NULL; @@ -742,7 +742,7 @@ static int virLockManagerLockDaemonRelease(virLockManagerPtr lock, } -static int virLockManagerLockDaemonInquire(virLockManagerPtr lock ATTRIBUTE_UNUSED, +static int virLockManagerLockDaemonInquire(virLockManagerPtr lock G_GNUC_UNUSED, char **state, unsigned int flags) { diff --git a/src/locking/lock_driver_nop.c b/src/locking/lock_driver_nop.c index 227195ff64..1e28a42dc0 100644 --- a/src/locking/lock_driver_nop.c +++ b/src/locking/lock_driver_nop.c @@ -29,9 +29,9 @@ VIR_LOG_INIT("locking.lock_driver_nop"); -static int virLockManagerNopInit(unsigned int version ATTRIBUTE_UNUSED, - const char *configFile ATTRIBUTE_UNUSED, - unsigned int flags_unused ATTRIBUTE_UNUSED) +static int virLockManagerNopInit(unsigned int version G_GNUC_UNUSED, + const char *configFile G_GNUC_UNUSED, + unsigned int flags_unused G_GNUC_UNUSED) { VIR_DEBUG("version=%u configFile=%s flags=0x%x", version, NULLSTR(configFile), flags_unused); @@ -47,38 +47,38 @@ static int virLockManagerNopDeinit(void) } -static int virLockManagerNopNew(virLockManagerPtr lock ATTRIBUTE_UNUSED, - unsigned int type ATTRIBUTE_UNUSED, - size_t nparams ATTRIBUTE_UNUSED, - virLockManagerParamPtr params ATTRIBUTE_UNUSED, - unsigned int flags_unused ATTRIBUTE_UNUSED) +static int virLockManagerNopNew(virLockManagerPtr lock G_GNUC_UNUSED, + unsigned int type G_GNUC_UNUSED, + size_t nparams G_GNUC_UNUSED, + virLockManagerParamPtr params G_GNUC_UNUSED, + unsigned int flags_unused G_GNUC_UNUSED) { return 0; } -static int virLockManagerNopAddResource(virLockManagerPtr lock ATTRIBUTE_UNUSED, - unsigned int type ATTRIBUTE_UNUSED, - const char *name ATTRIBUTE_UNUSED, - size_t nparams ATTRIBUTE_UNUSED, - virLockManagerParamPtr params ATTRIBUTE_UNUSED, - unsigned int flags_unused ATTRIBUTE_UNUSED) +static int virLockManagerNopAddResource(virLockManagerPtr lock G_GNUC_UNUSED, + unsigned int type G_GNUC_UNUSED, + const char *name G_GNUC_UNUSED, + size_t nparams G_GNUC_UNUSED, + virLockManagerParamPtr params G_GNUC_UNUSED, + unsigned int flags_unused G_GNUC_UNUSED) { return 0; } -static int virLockManagerNopAcquire(virLockManagerPtr lock ATTRIBUTE_UNUSED, - const char *state ATTRIBUTE_UNUSED, - unsigned int flags_unused ATTRIBUTE_UNUSED, - virDomainLockFailureAction action ATTRIBUTE_UNUSED, - int *fd ATTRIBUTE_UNUSED) +static int virLockManagerNopAcquire(virLockManagerPtr lock G_GNUC_UNUSED, + const char *state G_GNUC_UNUSED, + unsigned int flags_unused G_GNUC_UNUSED, + virDomainLockFailureAction action G_GNUC_UNUSED, + int *fd G_GNUC_UNUSED) { return 0; } -static int virLockManagerNopRelease(virLockManagerPtr lock ATTRIBUTE_UNUSED, +static int virLockManagerNopRelease(virLockManagerPtr lock G_GNUC_UNUSED, char **state, - unsigned int flags_unused ATTRIBUTE_UNUSED) + unsigned int flags_unused G_GNUC_UNUSED) { if (state) *state = NULL; @@ -86,9 +86,9 @@ static int virLockManagerNopRelease(virLockManagerPtr lock ATTRIBUTE_UNUSED, return 0; } -static int virLockManagerNopInquire(virLockManagerPtr lock ATTRIBUTE_UNUSED, +static int virLockManagerNopInquire(virLockManagerPtr lock G_GNUC_UNUSED, char **state, - unsigned int flags_unused ATTRIBUTE_UNUSED) + unsigned int flags_unused G_GNUC_UNUSED) { if (state) *state = NULL; @@ -96,7 +96,7 @@ static int virLockManagerNopInquire(virLockManagerPtr lock ATTRIBUTE_UNUSED, return 0; } -static void virLockManagerNopFree(virLockManagerPtr lock ATTRIBUTE_UNUSED) +static void virLockManagerNopFree(virLockManagerPtr lock G_GNUC_UNUSED) { } diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 7ebd63913e..5a5d130f3a 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -624,7 +624,7 @@ virLockManagerSanlockAddDisk(virLockManagerSanlockDriverPtr driver, virLockManagerPtr lock, const char *name, size_t nparams, - virLockManagerParamPtr params ATTRIBUTE_UNUSED, + virLockManagerParamPtr params G_GNUC_UNUSED, bool shared) { virLockManagerSanlockPrivatePtr priv = lock->privateData; @@ -920,10 +920,10 @@ virLockManagerSanlockRegisterKillscript(int sock, } #else static int -virLockManagerSanlockRegisterKillscript(int sock ATTRIBUTE_UNUSED, - const char *vmuri ATTRIBUTE_UNUSED, - const char *uuidstr ATTRIBUTE_UNUSED, - virDomainLockFailureAction action ATTRIBUTE_UNUSED) +virLockManagerSanlockRegisterKillscript(int sock G_GNUC_UNUSED, + const char *vmuri G_GNUC_UNUSED, + const char *uuidstr G_GNUC_UNUSED, + virDomainLockFailureAction action G_GNUC_UNUSED) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("sanlock is too old to support lock failure action")); diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index 1c8705ab11..c6940e5a69 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -196,10 +196,10 @@ virLockManagerPluginPtr virLockManagerPluginNew(const char *name, } #else /* !HAVE_DLFCN_H */ virLockManagerPluginPtr -virLockManagerPluginNew(const char *name ATTRIBUTE_UNUSED, - const char *driverName ATTRIBUTE_UNUSED, - const char *configDir ATTRIBUTE_UNUSED, - unsigned int flags_unused ATTRIBUTE_UNUSED) +virLockManagerPluginNew(const char *name G_GNUC_UNUSED, + const char *driverName G_GNUC_UNUSED, + const char *configDir G_GNUC_UNUSED, + unsigned int flags_unused G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("this platform is missing dlopen")); @@ -253,7 +253,7 @@ void virLockManagerPluginUnref(virLockManagerPluginPtr plugin) VIR_FREE(plugin); } #else /* !HAVE_DLFCN_H */ -void virLockManagerPluginUnref(virLockManagerPluginPtr plugin ATTRIBUTE_UNUSED) +void virLockManagerPluginUnref(virLockManagerPluginPtr plugin G_GNUC_UNUSED) { } #endif /* !HAVE_DLFCN_H */ diff --git a/src/locking/sanlock_helper.c b/src/locking/sanlock_helper.c index d589576f04..e07db8a6df 100644 --- a/src/locking/sanlock_helper.c +++ b/src/locking/sanlock_helper.c @@ -36,9 +36,9 @@ getArgs(int argc, static int -authCallback(virConnectCredentialPtr cred ATTRIBUTE_UNUSED, - unsigned int ncred ATTRIBUTE_UNUSED, - void *cbdata ATTRIBUTE_UNUSED) +authCallback(virConnectCredentialPtr cred G_GNUC_UNUSED, + unsigned int ncred G_GNUC_UNUSED, + void *cbdata G_GNUC_UNUSED) { return -1; } -- 2.19.2

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/lxc/lxc_cgroup.c | 4 ++-- src/lxc/lxc_container.c | 10 +++++----- src/lxc/lxc_controller.c | 4 ++-- src/lxc/lxc_domain.c | 26 +++++++++++++------------- src/lxc/lxc_driver.c | 18 +++++++++--------- src/lxc/lxc_fuse.c | 26 +++++++++++++------------- src/lxc/lxc_monitor.c | 12 ++++++------ src/lxc/lxc_process.c | 4 ++-- 8 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index 76014f3bfd..5efb495b56 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -272,7 +272,7 @@ struct _virLXCCgroupDevicePolicy { int -virLXCSetupHostUSBDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED, +virLXCSetupHostUSBDeviceCgroup(virUSBDevicePtr dev G_GNUC_UNUSED, const char *path, void *opaque) { @@ -288,7 +288,7 @@ virLXCSetupHostUSBDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED, int -virLXCTeardownHostUSBDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED, +virLXCTeardownHostUSBDeviceCgroup(virUSBDevicePtr dev G_GNUC_UNUSED, const char *path, void *opaque) { diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 97f9055506..2a0b04117e 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1035,8 +1035,8 @@ static int lxcContainerMountProcFuse(virDomainDefPtr def, return ret; } #else -static int lxcContainerMountProcFuse(virDomainDefPtr def ATTRIBUTE_UNUSED, - const char *stateDir ATTRIBUTE_UNUSED) +static int lxcContainerMountProcFuse(virDomainDefPtr def G_GNUC_UNUSED, + const char *stateDir G_GNUC_UNUSED) { return 0; } @@ -1305,7 +1305,7 @@ lxcContainerMountDetectFilesystem(const char *src, char **type) } #else /* ! WITH_BLKID */ static int -lxcContainerMountDetectFilesystem(const char *src ATTRIBUTE_UNUSED, +lxcContainerMountDetectFilesystem(const char *src G_GNUC_UNUSED, char **type) { /* No libblkid, so just return success with no detected type */ @@ -2083,8 +2083,8 @@ static int lxcContainerDropCapabilities(virDomainDefPtr def, return 0; } #else -static int lxcContainerDropCapabilities(virDomainDefPtr def ATTRIBUTE_UNUSED, - bool keepReboot ATTRIBUTE_UNUSED) +static int lxcContainerDropCapabilities(virDomainDefPtr def G_GNUC_UNUSED, + bool keepReboot G_GNUC_UNUSED) { VIR_WARN("libcap-ng support not compiled in, unable to clear capabilities"); return 0; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 9097655b4d..a1f4ae8812 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -150,7 +150,7 @@ static void virLXCControllerFree(virLXCControllerPtr ctrl); static int virLXCControllerEventSendInit(virLXCControllerPtr ctrl, pid_t initpid); -static void virLXCControllerQuitTimer(int timer ATTRIBUTE_UNUSED, void *opaque) +static void virLXCControllerQuitTimer(int timer G_GNUC_UNUSED, void *opaque) { virLXCControllerPtr ctrl = opaque; @@ -1027,7 +1027,7 @@ static virMutex lock = VIR_MUTEX_INITIALIZER; static void virLXCControllerSignalChildIO(virNetDaemonPtr dmn, - siginfo_t *info ATTRIBUTE_UNUSED, + siginfo_t *info G_GNUC_UNUSED, void *opaque) { virLXCControllerPtr ctrl = opaque; diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index c4360f25f6..4339d305a9 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -84,7 +84,7 @@ virLXCDomainObjFreeJob(virLXCDomainObjPrivatePtr priv) * Successful calls must be followed by EndJob eventually. */ int -virLXCDomainObjBeginJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED, +virLXCDomainObjBeginJob(virLXCDriverPtr driver G_GNUC_UNUSED, virDomainObjPtr obj, enum virLXCDomainJob job) { @@ -136,7 +136,7 @@ virLXCDomainObjBeginJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED, * earlier virLXCDomainBeginJob() call */ void -virLXCDomainObjEndJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED, +virLXCDomainObjEndJob(virLXCDriverPtr driver G_GNUC_UNUSED, virDomainObjPtr obj) { virLXCDomainObjPrivatePtr priv = obj->privateData; @@ -151,7 +151,7 @@ virLXCDomainObjEndJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED, static void * -virLXCDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED) +virLXCDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED) { virLXCDomainObjPrivatePtr priv; @@ -326,7 +326,7 @@ virLXCDomainObjPrivateXMLFormat(virBufferPtr buf, static int virLXCDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, virDomainObjPtr vm, - virDomainDefParserConfigPtr config ATTRIBUTE_UNUSED) + virDomainDefParserConfigPtr config G_GNUC_UNUSED) { virLXCDomainObjPrivatePtr priv = vm->privateData; long long thepid; @@ -352,9 +352,9 @@ virDomainXMLPrivateDataCallbacks virLXCDriverPrivateDataCallbacks = { static int virLXCDomainDefPostParse(virDomainDefPtr def, virCapsPtr caps, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) + unsigned int parseFlags G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED, + void *parseOpaque G_GNUC_UNUSED) { /* check for emulator and create a default one if needed */ if (!def->emulator && @@ -367,11 +367,11 @@ virLXCDomainDefPostParse(virDomainDefPtr def, static int virLXCDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, - const virDomainDef *def ATTRIBUTE_UNUSED, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) + const virDomainDef *def G_GNUC_UNUSED, + virCapsPtr caps G_GNUC_UNUSED, + unsigned int parseFlags G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED, + void *parseOpaque G_GNUC_UNUSED) { if (dev->type == VIR_DOMAIN_DEVICE_CHR && dev->data.chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE && @@ -415,7 +415,7 @@ struct _lxcDomainInitctlCallbackData { static int -lxcDomainInitctlCallback(pid_t pid ATTRIBUTE_UNUSED, +lxcDomainInitctlCallback(pid_t pid G_GNUC_UNUSED, void *opaque) { lxcDomainInitctlCallbackData *data = opaque; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index c0bbeb09e8..5c7a9140b2 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -133,8 +133,8 @@ lxcConnectURIProbe(char **uri) static virDrvOpenStatus lxcConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -174,21 +174,21 @@ static int lxcConnectClose(virConnectPtr conn) } -static int lxcConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int lxcConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* Trivially secure, since always inside the daemon */ return 1; } -static int lxcConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int lxcConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* Not encrypted, but remote driver takes care of that */ return 0; } -static int lxcConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int lxcConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } @@ -1536,8 +1536,8 @@ lxcSecurityInit(virLXCDriverConfigPtr cfg) static int lxcStateInitialize(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + virStateInhibitCallback callback G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { virCapsPtr caps = NULL; virLXCDriverConfigPtr cfg = NULL; @@ -3577,7 +3577,7 @@ struct lxcDomainAttachDeviceMknodData { }; static int -lxcDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, +lxcDomainAttachDeviceMknodHelper(pid_t pid G_GNUC_UNUSED, void *opaque) { struct lxcDomainAttachDeviceMknodData *data = opaque; @@ -3685,7 +3685,7 @@ lxcDomainAttachDeviceMknod(virLXCDriverPtr driver, static int -lxcDomainAttachDeviceUnlinkHelper(pid_t pid ATTRIBUTE_UNUSED, +lxcDomainAttachDeviceUnlinkHelper(pid_t pid G_GNUC_UNUSED, void *opaque) { const char *path = opaque; diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 4137d1b04f..b64b275a87 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -82,8 +82,8 @@ static int lxcProcGetattr(const char *path, struct stat *stbuf) static int lxcProcReaddir(const char *path, void *buf, fuse_fill_dir_t filler, - off_t offset ATTRIBUTE_UNUSED, - struct fuse_file_info *fi ATTRIBUTE_UNUSED) + off_t offset G_GNUC_UNUSED, + struct fuse_file_info *fi G_GNUC_UNUSED) { if (STRNEQ(path, "/")) return -ENOENT; @@ -95,8 +95,8 @@ static int lxcProcReaddir(const char *path, void *buf, return 0; } -static int lxcProcOpen(const char *path ATTRIBUTE_UNUSED, - struct fuse_file_info *fi ATTRIBUTE_UNUSED) +static int lxcProcOpen(const char *path G_GNUC_UNUSED, + struct fuse_file_info *fi G_GNUC_UNUSED) { if (STRNEQ(path, fuse_meminfo_path)) return -ENOENT; @@ -240,11 +240,11 @@ static int lxcProcReadMeminfo(char *hostpath, virDomainDefPtr def, return res; } -static int lxcProcRead(const char *path ATTRIBUTE_UNUSED, - char *buf ATTRIBUTE_UNUSED, - size_t size ATTRIBUTE_UNUSED, - off_t offset ATTRIBUTE_UNUSED, - struct fuse_file_info *fi ATTRIBUTE_UNUSED) +static int lxcProcRead(const char *path G_GNUC_UNUSED, + char *buf G_GNUC_UNUSED, + size_t size G_GNUC_UNUSED, + off_t offset G_GNUC_UNUSED, + struct fuse_file_info *fi G_GNUC_UNUSED) { int res = -ENOENT; char *hostpath = NULL; @@ -376,18 +376,18 @@ void lxcFreeFuse(virLXCFusePtr *f) } } #else -int lxcSetupFuse(virLXCFusePtr *f ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED) +int lxcSetupFuse(virLXCFusePtr *f G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED) { return 0; } -int lxcStartFuse(virLXCFusePtr f ATTRIBUTE_UNUSED) +int lxcStartFuse(virLXCFusePtr f G_GNUC_UNUSED) { return 0; } -void lxcFreeFuse(virLXCFusePtr *f ATTRIBUTE_UNUSED) +void lxcFreeFuse(virLXCFusePtr *f G_GNUC_UNUSED) { } #endif diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index 6d3db9629a..4e67e29293 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -81,8 +81,8 @@ static virNetClientProgramEvent virLXCMonitorEvents[] = { static void -virLXCMonitorHandleEventExit(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +virLXCMonitorHandleEventExit(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virLXCMonitorPtr mon = opaque; @@ -95,8 +95,8 @@ virLXCMonitorHandleEventExit(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, static void -virLXCMonitorHandleEventInit(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +virLXCMonitorHandleEventInit(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virLXCMonitorPtr mon = opaque; @@ -108,8 +108,8 @@ virLXCMonitorHandleEventInit(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, } -static void virLXCMonitorEOFNotify(virNetClientPtr client ATTRIBUTE_UNUSED, - int reason ATTRIBUTE_UNUSED, +static void virLXCMonitorEOFNotify(virNetClientPtr client G_GNUC_UNUSED, + int reason G_GNUC_UNUSED, void *opaque) { virLXCMonitorPtr mon = opaque; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 318b4c1653..d3017e9b05 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -720,7 +720,7 @@ static void virLXCProcessMonitorEOFNotify(virLXCMonitorPtr mon, virObjectEventStateQueue(driver->domainEventState, event); } -static void virLXCProcessMonitorExitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED, +static void virLXCProcessMonitorExitNotify(virLXCMonitorPtr mon G_GNUC_UNUSED, virLXCMonitorExitStatus status, virDomainObjPtr vm) { @@ -779,7 +779,7 @@ virLXCProcessGetNsInode(pid_t pid, /* XXX a little evil */ extern virLXCDriverPtr lxc_driver; -static void virLXCProcessMonitorInitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED, +static void virLXCProcessMonitorInitNotify(virLXCMonitorPtr mon G_GNUC_UNUSED, pid_t initpid, virDomainObjPtr vm) { -- 2.19.2

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/node_device/node_device_driver.c | 14 +++++++------- src/node_device/node_device_hal.c | 18 +++++++++--------- src/node_device/node_device_udev.c | 20 ++++++++++---------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 578489c5be..f95eacf6a2 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -46,8 +46,8 @@ virNodeDeviceDriverStatePtr driver; virDrvOpenStatus nodeConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -69,27 +69,27 @@ nodeConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -int nodeConnectClose(virConnectPtr conn ATTRIBUTE_UNUSED) +int nodeConnectClose(virConnectPtr conn G_GNUC_UNUSED) { return 0; } -int nodeConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +int nodeConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* Trivially secure, since always inside the daemon */ return 1; } -int nodeConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +int nodeConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* Not encrypted, but remote driver takes care of that */ return 0; } -int nodeConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +int nodeConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } @@ -142,7 +142,7 @@ nodeDeviceUpdateDriverName(virNodeDeviceDefPtr def) #else /* XXX: Implement me for non-linux */ static int -nodeDeviceUpdateDriverName(virNodeDeviceDefPtr def ATTRIBUTE_UNUSED) +nodeDeviceUpdateDriverName(virNodeDeviceDefPtr def G_GNUC_UNUSED) { return 0; } diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index c613ca5808..b046f03c83 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -520,7 +520,7 @@ dev_refresh(const char *udi) } static void -device_added(LibHalContext *ctx ATTRIBUTE_UNUSED, +device_added(LibHalContext *ctx G_GNUC_UNUSED, const char *udi) { VIR_DEBUG("%s", hal_name(udi)); @@ -529,7 +529,7 @@ device_added(LibHalContext *ctx ATTRIBUTE_UNUSED, static void -device_removed(LibHalContext *ctx ATTRIBUTE_UNUSED, +device_removed(LibHalContext *ctx G_GNUC_UNUSED, const char *udi) { const char *name = hal_name(udi); @@ -565,7 +565,7 @@ device_cap_added(LibHalContext *ctx, static void -device_cap_lost(LibHalContext *ctx ATTRIBUTE_UNUSED, +device_cap_lost(LibHalContext *ctx G_GNUC_UNUSED, const char *udi, const char *cap) { @@ -577,11 +577,11 @@ device_cap_lost(LibHalContext *ctx ATTRIBUTE_UNUSED, static void -device_prop_modified(LibHalContext *ctx ATTRIBUTE_UNUSED, +device_prop_modified(LibHalContext *ctx G_GNUC_UNUSED, const char *udi, const char *key, - dbus_bool_t is_removed ATTRIBUTE_UNUSED, - dbus_bool_t is_added ATTRIBUTE_UNUSED) + dbus_bool_t is_removed G_GNUC_UNUSED, + dbus_bool_t is_added G_GNUC_UNUSED) { const char *name = hal_name(udi); VIR_DEBUG("%s %s", name, key); @@ -591,9 +591,9 @@ device_prop_modified(LibHalContext *ctx ATTRIBUTE_UNUSED, static int -nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +nodeStateInitialize(bool privileged G_GNUC_UNUSED, + virStateInhibitCallback callback G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { LibHalContext *hal_ctx = NULL; char **udi = NULL; diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 5550ee3a54..80d39e9509 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -606,7 +606,7 @@ udevProcessNetworkInterface(struct udev_device *device, static int -udevProcessSCSIHost(struct udev_device *device ATTRIBUTE_UNUSED, +udevProcessSCSIHost(struct udev_device *device G_GNUC_UNUSED, virNodeDeviceDefPtr def) { virNodeDevCapSCSIHostPtr scsi_host = &def->caps->data.scsi_host; @@ -654,7 +654,7 @@ udevProcessSCSITarget(struct udev_device *device, static int -udevGetSCSIType(virNodeDeviceDefPtr def ATTRIBUTE_UNUSED, +udevGetSCSIType(virNodeDeviceDefPtr def G_GNUC_UNUSED, unsigned int type, char **typestring) { @@ -714,7 +714,7 @@ udevGetSCSIType(virNodeDeviceDefPtr def ATTRIBUTE_UNUSED, static int -udevProcessSCSIDevice(struct udev_device *device ATTRIBUTE_UNUSED, +udevProcessSCSIDevice(struct udev_device *device G_GNUC_UNUSED, virNodeDeviceDefPtr def) { int ret = -1; @@ -1578,7 +1578,7 @@ udevEventMonitorSanityCheck(udevEventDataPtr priv, * would still come into play. */ static void -udevEventHandleThread(void *opaque ATTRIBUTE_UNUSED) +udevEventHandleThread(void *opaque G_GNUC_UNUSED) { udevEventDataPtr priv = driver->privateData; struct udev_device *device = NULL; @@ -1645,10 +1645,10 @@ udevEventHandleThread(void *opaque ATTRIBUTE_UNUSED) static void -udevEventHandleCallback(int watch ATTRIBUTE_UNUSED, +udevEventHandleCallback(int watch G_GNUC_UNUSED, int fd, - int events ATTRIBUTE_UNUSED, - void *data ATTRIBUTE_UNUSED) + int events G_GNUC_UNUSED, + void *data G_GNUC_UNUSED) { udevEventDataPtr priv = driver->privateData; @@ -1783,7 +1783,7 @@ nodeStateInitializeEnumerate(void *opaque) static int -udevPCITranslateInit(bool privileged ATTRIBUTE_UNUSED) +udevPCITranslateInit(bool privileged G_GNUC_UNUSED) { #if defined __s390__ || defined __s390x_ /* On s390(x) system there is no PCI bus. @@ -1808,8 +1808,8 @@ udevPCITranslateInit(bool privileged ATTRIBUTE_UNUSED) static int nodeStateInitialize(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + virStateInhibitCallback callback G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { udevEventDataPtr priv = NULL; struct udev *udev = NULL; -- 2.19.2

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/openvz/openvz_driver.c | 92 +++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 98db7fceec..408b393e30 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -112,10 +112,10 @@ openvzDomObjFromDomain(struct openvz_driver *driver, static int openvzDomainDefPostParse(virDomainDefPtr def, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) + virCapsPtr caps G_GNUC_UNUSED, + unsigned int parseFlags G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED, + void *parseOpaque G_GNUC_UNUSED) { /* fill the init path */ if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) { @@ -129,11 +129,11 @@ openvzDomainDefPostParse(virDomainDefPtr def, static int openvzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, - const virDomainDef *def ATTRIBUTE_UNUSED, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) + const virDomainDef *def G_GNUC_UNUSED, + virCapsPtr caps G_GNUC_UNUSED, + unsigned int parseFlags G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED, + void *parseOpaque G_GNUC_UNUSED) { if (dev->type == VIR_DOMAIN_DEVICE_CHR && dev->data.chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE && @@ -358,7 +358,7 @@ static int openvzConnectGetVersion(virConnectPtr conn, unsigned long *version) } -static char *openvzConnectGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) +static char *openvzConnectGetHostname(virConnectPtr conn G_GNUC_UNUSED) { return virGetHostname(); } @@ -509,7 +509,7 @@ static int openvzDomainIsPersistent(virDomainPtr dom) return ret; } -static int openvzDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED) +static int openvzDomainIsUpdated(virDomainPtr dom G_GNUC_UNUSED) { return 0; } @@ -1209,7 +1209,7 @@ openvzDomainGetAutostart(virDomainPtr dom, int *autostart) return ret; } -static int openvzConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, +static int openvzConnectGetMaxVcpus(virConnectPtr conn G_GNUC_UNUSED, const char *type) { if (type == NULL || STRCASEEQ(type, "openvz")) @@ -1221,7 +1221,7 @@ static int openvzConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, } static int -openvzDomainGetVcpusFlags(virDomainPtr dom ATTRIBUTE_UNUSED, +openvzDomainGetVcpusFlags(virDomainPtr dom G_GNUC_UNUSED, unsigned int flags) { if (flags != (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) { @@ -1322,8 +1322,8 @@ openvzConnectURIProbe(char **uri) static virDrvOpenStatus openvzConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { struct openvz_driver *driver; @@ -1391,24 +1391,24 @@ static int openvzConnectClose(virConnectPtr conn) return 0; } -static const char *openvzConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { +static const char *openvzConnectGetType(virConnectPtr conn G_GNUC_UNUSED) { return "OpenVZ"; } -static int openvzConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int openvzConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* Encryption is not relevant / applicable to way we talk to openvz */ return 0; } -static int openvzConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int openvzConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* We run CLI tools directly so this is secure */ return 1; } static int -openvzConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +openvzConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } @@ -1424,7 +1424,7 @@ static char *openvzConnectGetCapabilities(virConnectPtr conn) { return ret; } -static int openvzConnectListDomains(virConnectPtr conn ATTRIBUTE_UNUSED, +static int openvzConnectListDomains(virConnectPtr conn G_GNUC_UNUSED, int *ids, int nids) { int got = 0; @@ -1480,7 +1480,7 @@ static int openvzConnectNumOfDomains(virConnectPtr conn) return n; } -static int openvzConnectListDefinedDomains(virConnectPtr conn ATTRIBUTE_UNUSED, +static int openvzConnectListDefinedDomains(virConnectPtr conn G_GNUC_UNUSED, char **const names, int nnames) { int got = 0; int veid, outfd = -1, ret; @@ -2003,7 +2003,7 @@ openvzConnectListAllDomains(virConnectPtr conn, static int -openvzNodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, +openvzNodeGetInfo(virConnectPtr conn G_GNUC_UNUSED, virNodeInfoPtr nodeinfo) { return virCapabilitiesGetNodeInfo(nodeinfo); @@ -2011,7 +2011,7 @@ openvzNodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, static int -openvzNodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED, +openvzNodeGetCPUStats(virConnectPtr conn G_GNUC_UNUSED, int cpuNum, virNodeCPUStatsPtr params, int *nparams, @@ -2022,7 +2022,7 @@ openvzNodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED, static int -openvzNodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, +openvzNodeGetMemoryStats(virConnectPtr conn G_GNUC_UNUSED, int cellNum, virNodeMemoryStatsPtr params, int *nparams, @@ -2033,7 +2033,7 @@ openvzNodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, static int -openvzNodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED, +openvzNodeGetCellsFreeMemory(virConnectPtr conn G_GNUC_UNUSED, unsigned long long *freeMems, int startCell, int maxCells) @@ -2043,7 +2043,7 @@ openvzNodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED, static unsigned long long -openvzNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED) +openvzNodeGetFreeMemory(virConnectPtr conn G_GNUC_UNUSED) { unsigned long long freeMem; if (virHostMemGetInfo(NULL, &freeMem) < 0) @@ -2053,7 +2053,7 @@ openvzNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED) static int -openvzNodeGetCPUMap(virConnectPtr conn ATTRIBUTE_UNUSED, +openvzNodeGetCPUMap(virConnectPtr conn G_GNUC_UNUSED, unsigned char **cpumap, unsigned int *online, unsigned int flags) @@ -2063,7 +2063,7 @@ openvzNodeGetCPUMap(virConnectPtr conn ATTRIBUTE_UNUSED, static int -openvzConnectSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feature) +openvzConnectSupportsFeature(virConnectPtr conn G_GNUC_UNUSED, int feature) { switch ((virDrvFeature) feature) { case VIR_DRV_FEATURE_MIGRATION_PARAMS: @@ -2092,8 +2092,8 @@ static char * openvzDomainMigrateBegin3Params(virDomainPtr domain, virTypedParameterPtr params, int nparams, - char **cookieout ATTRIBUTE_UNUSED, - int *cookieoutlen ATTRIBUTE_UNUSED, + char **cookieout G_GNUC_UNUSED, + int *cookieoutlen G_GNUC_UNUSED, unsigned int flags) { virDomainObjPtr vm = NULL; @@ -2132,12 +2132,12 @@ static int openvzDomainMigratePrepare3Params(virConnectPtr dconn, virTypedParameterPtr params, int nparams, - const char *cookiein ATTRIBUTE_UNUSED, - int cookieinlen ATTRIBUTE_UNUSED, - char **cookieout ATTRIBUTE_UNUSED, - int *cookieoutlen ATTRIBUTE_UNUSED, + const char *cookiein G_GNUC_UNUSED, + int cookieinlen G_GNUC_UNUSED, + char **cookieout G_GNUC_UNUSED, + int *cookieoutlen G_GNUC_UNUSED, char **uri_out, - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { struct openvz_driver *driver = dconn->privateData; const char *dom_xml = NULL; @@ -2230,13 +2230,13 @@ openvzDomainMigratePrepare3Params(virConnectPtr dconn, static int openvzDomainMigratePerform3Params(virDomainPtr domain, - const char *dconnuri ATTRIBUTE_UNUSED, + const char *dconnuri G_GNUC_UNUSED, virTypedParameterPtr params, int nparams, - const char *cookiein ATTRIBUTE_UNUSED, - int cookieinlen ATTRIBUTE_UNUSED, - char **cookieout ATTRIBUTE_UNUSED, - int *cookieoutlen ATTRIBUTE_UNUSED, + const char *cookiein G_GNUC_UNUSED, + int cookieinlen G_GNUC_UNUSED, + char **cookieout G_GNUC_UNUSED, + int *cookieoutlen G_GNUC_UNUSED, unsigned int flags) { struct openvz_driver *driver = domain->conn->privateData; @@ -2285,10 +2285,10 @@ static virDomainPtr openvzDomainMigrateFinish3Params(virConnectPtr dconn, virTypedParameterPtr params, int nparams, - const char *cookiein ATTRIBUTE_UNUSED, - int cookieinlen ATTRIBUTE_UNUSED, - char **cookieout ATTRIBUTE_UNUSED, - int *cookieoutlen ATTRIBUTE_UNUSED, + const char *cookiein G_GNUC_UNUSED, + int cookieinlen G_GNUC_UNUSED, + char **cookieout G_GNUC_UNUSED, + int *cookieoutlen G_GNUC_UNUSED, unsigned int flags, int cancelled) { @@ -2343,8 +2343,8 @@ static int openvzDomainMigrateConfirm3Params(virDomainPtr domain, virTypedParameterPtr params, int nparams, - const char *cookiein ATTRIBUTE_UNUSED, - int cookieinlen ATTRIBUTE_UNUSED, + const char *cookiein G_GNUC_UNUSED, + int cookieinlen G_GNUC_UNUSED, unsigned int flags, int cancelled) { -- 2.19.2

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/remote/remote_daemon.c | 20 +- src/remote/remote_daemon_config.c | 2 +- src/remote/remote_daemon_dispatch.c | 420 ++++++++++++++-------------- src/remote/remote_daemon_stream.c | 2 +- src/remote/remote_driver.c | 270 +++++++++--------- 5 files changed, 357 insertions(+), 357 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 7fcaa31c49..5f50d07002 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -273,8 +273,8 @@ daemonUnixSocketPaths(struct daemonConfig *config, } -static void daemonErrorHandler(void *opaque ATTRIBUTE_UNUSED, - virErrorPtr err ATTRIBUTE_UNUSED) +static void daemonErrorHandler(void *opaque G_GNUC_UNUSED, + virErrorPtr err G_GNUC_UNUSED) { /* Don't do anything, since logging infrastructure already * took care of reporting the error */ @@ -698,13 +698,13 @@ daemonVersion(const char *argv0) static void daemonShutdownHandler(virNetDaemonPtr dmn, - siginfo_t *sig ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + siginfo_t *sig G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { virNetDaemonQuit(dmn); } -static void daemonReloadHandlerThread(void *opague ATTRIBUTE_UNUSED) +static void daemonReloadHandlerThread(void *opague G_GNUC_UNUSED) { VIR_INFO("Reloading configuration on SIGHUP"); virHookCall(VIR_HOOK_DRIVER_DAEMON, "-", @@ -713,9 +713,9 @@ static void daemonReloadHandlerThread(void *opague ATTRIBUTE_UNUSED) VIR_WARN("Error while reloading drivers"); } -static void daemonReloadHandler(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, - siginfo_t *sig ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +static void daemonReloadHandler(virNetDaemonPtr dmn G_GNUC_UNUSED, + siginfo_t *sig G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { virThread thr; @@ -787,7 +787,7 @@ static void daemonStop(virNetDaemonPtr dmn) static DBusHandlerResult -handleSessionMessageFunc(DBusConnection *connection ATTRIBUTE_UNUSED, +handleSessionMessageFunc(DBusConnection *connection G_GNUC_UNUSED, DBusMessage *message, void *opaque) { @@ -805,7 +805,7 @@ handleSessionMessageFunc(DBusConnection *connection ATTRIBUTE_UNUSED, static DBusHandlerResult -handleSystemMessageFunc(DBusConnection *connection ATTRIBUTE_UNUSED, +handleSystemMessageFunc(DBusConnection *connection G_GNUC_UNUSED, DBusMessage *message, void *opaque) { diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_config.c index 0eecb20c34..ce5f8c5278 100644 --- a/src/remote/remote_daemon_config.c +++ b/src/remote/remote_daemon_config.c @@ -100,7 +100,7 @@ daemonConfigFilePath(bool privileged, char **configfile) } struct daemonConfig* -daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) +daemonConfigNew(bool privileged G_GNUC_UNUSED) { struct daemonConfig *data; diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 8c9390c1d2..cd929c36da 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -1822,7 +1822,7 @@ remoteRelayDomainQemuMonitorEvent(virConnectPtr conn, } static -void remoteRelayConnectionClosedEvent(virConnectPtr conn ATTRIBUTE_UNUSED, int reason, void *opaque) +void remoteRelayConnectionClosedEvent(virConnectPtr conn G_GNUC_UNUSED, int reason, void *opaque) { virNetServerClientPtr client = opaque; @@ -2109,7 +2109,7 @@ remoteGetStorageConn(virNetServerClientPtr client) void *remoteClientNew(virNetServerClientPtr client, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { struct daemonClientPrivate *priv; @@ -2254,9 +2254,9 @@ remoteDispatchProbeURI(bool readonly, static int -remoteDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectOpen(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, struct remote_connect_open_args *args) { @@ -2408,10 +2408,10 @@ remoteDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchConnectClose(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectClose(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED) + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED) { virNetServerClientDelayedClose(client); return 0; @@ -2419,9 +2419,9 @@ remoteDispatchConnectClose(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchConnectSetIdentity(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectSetIdentity(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_connect_set_identity_args *args) { @@ -2466,9 +2466,9 @@ remoteDispatchConnectSetIdentity(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchDomainGetSchedulerType(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetSchedulerType(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_scheduler_type_args *args, remote_domain_get_scheduler_type_ret *ret) @@ -2500,9 +2500,9 @@ remoteDispatchDomainGetSchedulerType(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainGetSchedulerParameters(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetSchedulerParameters(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_scheduler_parameters_args *args, remote_domain_get_scheduler_parameters_ret *ret) @@ -2548,9 +2548,9 @@ remoteDispatchDomainGetSchedulerParameters(virNetServerPtr server ATTRIBUTE_UNUS } static int -remoteDispatchDomainGetSchedulerParametersFlags(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetSchedulerParametersFlags(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_scheduler_parameters_flags_args *args, remote_domain_get_scheduler_parameters_flags_ret *ret) @@ -2597,9 +2597,9 @@ remoteDispatchDomainGetSchedulerParametersFlags(virNetServerPtr server ATTRIBUTE } static int -remoteDispatchDomainMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMemoryStats(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_memory_stats_args *args, remote_domain_memory_stats_ret *ret) @@ -2652,9 +2652,9 @@ remoteDispatchDomainMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainBlockPeek(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainBlockPeek(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_block_peek_args *args, remote_domain_block_peek_ret *ret) @@ -2703,9 +2703,9 @@ remoteDispatchDomainBlockPeek(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainBlockStatsFlags(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainBlockStatsFlags(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_block_stats_flags_args *args, remote_domain_block_stats_flags_ret *ret) @@ -2764,9 +2764,9 @@ remoteDispatchDomainBlockStatsFlags(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainMemoryPeek(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMemoryPeek(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_memory_peek_args *args, remote_domain_memory_peek_ret *ret) @@ -2813,9 +2813,9 @@ remoteDispatchDomainMemoryPeek(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainGetSecurityLabel(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetSecurityLabel(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_security_label_args *args, remote_domain_get_security_label_ret *ret) @@ -2854,9 +2854,9 @@ remoteDispatchDomainGetSecurityLabel(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainGetSecurityLabelList(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetSecurityLabelList(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_security_label_list_args *args, remote_domain_get_security_label_list_ret *ret) @@ -2908,9 +2908,9 @@ remoteDispatchDomainGetSecurityLabelList(virNetServerPtr server ATTRIBUTE_UNUSED } static int -remoteDispatchNodeGetSecurityModel(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNodeGetSecurityModel(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_node_get_security_model_ret *ret) { @@ -2944,9 +2944,9 @@ remoteDispatchNodeGetSecurityModel(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainGetVcpuPinInfo(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetVcpuPinInfo(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_vcpu_pin_info_args *args, remote_domain_get_vcpu_pin_info_ret *ret) @@ -3006,9 +3006,9 @@ remoteDispatchDomainGetVcpuPinInfo(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainPinEmulator(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainPinEmulator(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_pin_emulator_args *args) { @@ -3039,9 +3039,9 @@ remoteDispatchDomainPinEmulator(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchDomainGetEmulatorPinInfo(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetEmulatorPinInfo(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_emulator_pin_info_args *args, remote_domain_get_emulator_pin_info_ret *ret) @@ -3085,9 +3085,9 @@ remoteDispatchDomainGetEmulatorPinInfo(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainGetVcpus(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetVcpus(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_vcpus_args *args, remote_domain_get_vcpus_ret *ret) @@ -3163,9 +3163,9 @@ remoteDispatchDomainGetVcpus(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainGetIOThreadInfo(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetIOThreadInfo(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_iothread_info_args *args, remote_domain_get_iothread_info_ret *ret) @@ -3233,9 +3233,9 @@ remoteDispatchDomainGetIOThreadInfo(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainMigratePrepare(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMigratePrepare(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_prepare_args *args, remote_domain_migrate_prepare_ret *ret) @@ -3285,9 +3285,9 @@ remoteDispatchDomainMigratePrepare(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainMigratePrepare2(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMigratePrepare2(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_prepare2_args *args, remote_domain_migrate_prepare2_ret *ret) @@ -3334,9 +3334,9 @@ remoteDispatchDomainMigratePrepare2(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetMemoryParameters(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_memory_parameters_args *args, remote_domain_get_memory_parameters_ret *ret) @@ -3394,9 +3394,9 @@ remoteDispatchDomainGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainGetNumaParameters(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetNumaParameters(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_numa_parameters_args *args, remote_domain_get_numa_parameters_ret *ret) @@ -3454,9 +3454,9 @@ remoteDispatchDomainGetNumaParameters(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainGetBlkioParameters(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetBlkioParameters(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_blkio_parameters_args *args, remote_domain_get_blkio_parameters_ret *ret) @@ -3514,9 +3514,9 @@ remoteDispatchDomainGetBlkioParameters(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchNodeGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNodeGetCPUStats(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_node_get_cpu_stats_args *args, remote_node_get_cpu_stats_ret *ret) @@ -3583,9 +3583,9 @@ remoteDispatchNodeGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchNodeGetMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNodeGetMemoryStats(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_node_get_memory_stats_args *args, remote_node_get_memory_stats_ret *ret) @@ -3652,9 +3652,9 @@ remoteDispatchNodeGetMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainGetLaunchSecurityInfo(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetLaunchSecurityInfo(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_launch_security_info_args *args, remote_domain_get_launch_security_info_ret *ret) @@ -3692,9 +3692,9 @@ remoteDispatchDomainGetLaunchSecurityInfo(virNetServerPtr server ATTRIBUTE_UNUSE } static int -remoteDispatchDomainGetPerfEvents(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetPerfEvents(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_perf_events_args *args, remote_domain_get_perf_events_ret *ret) @@ -3732,9 +3732,9 @@ remoteDispatchDomainGetPerfEvents(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainGetBlockJobInfo(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetBlockJobInfo(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_block_job_info_args *args, remote_domain_get_block_job_info_ret *ret) @@ -3769,9 +3769,9 @@ remoteDispatchDomainGetBlockJobInfo(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainGetBlockIoTune(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetBlockIoTune(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr hdr ATTRIBUTE_UNUSED, + virNetMessagePtr hdr G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_block_io_tune_args *args, remote_domain_get_block_io_tune_ret *ret) @@ -3833,7 +3833,7 @@ remoteDispatchDomainGetBlockIoTune(virNetServerPtr server ATTRIBUTE_UNUSED, static int remoteDispatchAuthList(virNetServerPtr server, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_auth_list_ret *ret) { @@ -3897,9 +3897,9 @@ remoteDispatchAuthList(virNetServerPtr server, * and gives the client a list of allowed mechanisms to choose */ static int -remoteDispatchAuthSaslInit(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchAuthSaslInit(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_auth_sasl_init_ret *ret) { @@ -4023,7 +4023,7 @@ remoteSASLFinish(virNetServerPtr server, static int remoteDispatchAuthSaslStart(virNetServerPtr server, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_auth_sasl_start_args *args, remote_auth_sasl_start_ret *ret) @@ -4119,7 +4119,7 @@ remoteDispatchAuthSaslStart(virNetServerPtr server, static int remoteDispatchAuthSaslStep(virNetServerPtr server, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_auth_sasl_step_args *args, remote_auth_sasl_step_ret *ret) @@ -4212,11 +4212,11 @@ remoteDispatchAuthSaslStep(virNetServerPtr server, } #else static int -remoteDispatchAuthSaslInit(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, +remoteDispatchAuthSaslInit(virNetServerPtr server G_GNUC_UNUSED, + virNetServerClientPtr client G_GNUC_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, - remote_auth_sasl_init_ret *ret ATTRIBUTE_UNUSED) + remote_auth_sasl_init_ret *ret G_GNUC_UNUSED) { VIR_WARN("Client tried unsupported SASL auth"); virReportError(VIR_ERR_AUTH_FAILED, "%s", @@ -4225,12 +4225,12 @@ remoteDispatchAuthSaslInit(virNetServerPtr server ATTRIBUTE_UNUSED, return -1; } static int -remoteDispatchAuthSaslStart(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, +remoteDispatchAuthSaslStart(virNetServerPtr server G_GNUC_UNUSED, + virNetServerClientPtr client G_GNUC_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, - remote_auth_sasl_start_args *args ATTRIBUTE_UNUSED, - remote_auth_sasl_start_ret *ret ATTRIBUTE_UNUSED) + remote_auth_sasl_start_args *args G_GNUC_UNUSED, + remote_auth_sasl_start_ret *ret G_GNUC_UNUSED) { VIR_WARN("Client tried unsupported SASL auth"); virReportError(VIR_ERR_AUTH_FAILED, "%s", @@ -4239,12 +4239,12 @@ remoteDispatchAuthSaslStart(virNetServerPtr server ATTRIBUTE_UNUSED, return -1; } static int -remoteDispatchAuthSaslStep(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, +remoteDispatchAuthSaslStep(virNetServerPtr server G_GNUC_UNUSED, + virNetServerClientPtr client G_GNUC_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, - remote_auth_sasl_step_args *args ATTRIBUTE_UNUSED, - remote_auth_sasl_step_ret *ret ATTRIBUTE_UNUSED) + remote_auth_sasl_step_args *args G_GNUC_UNUSED, + remote_auth_sasl_step_ret *ret G_GNUC_UNUSED) { VIR_WARN("Client tried unsupported SASL auth"); virReportError(VIR_ERR_AUTH_FAILED, "%s", @@ -4259,7 +4259,7 @@ remoteDispatchAuthSaslStep(virNetServerPtr server ATTRIBUTE_UNUSED, static int remoteDispatchAuthPolkit(virNetServerPtr server, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_auth_polkit_ret *ret) { @@ -4341,9 +4341,9 @@ remoteDispatchAuthPolkit(virNetServerPtr server, static int -remoteDispatchNodeDeviceGetParent(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNodeDeviceGetParent(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_node_device_get_parent_args *args, remote_node_device_get_parent_ret *ret) @@ -4380,9 +4380,9 @@ remoteDispatchNodeDeviceGetParent(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchConnectRegisterCloseCallback(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectRegisterCloseCallback(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr) { int rv = -1; @@ -4411,9 +4411,9 @@ remoteDispatchConnectRegisterCloseCallback(virNetServerPtr server ATTRIBUTE_UNUS } static int -remoteDispatchConnectUnregisterCloseCallback(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectUnregisterCloseCallback(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr) { int rv = -1; @@ -4441,11 +4441,11 @@ remoteDispatchConnectUnregisterCloseCallback(virNetServerPtr server ATTRIBUTE_UN } static int -remoteDispatchConnectDomainEventRegister(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectDomainEventRegister(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, - remote_connect_domain_event_register_ret *ret ATTRIBUTE_UNUSED) + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED, + remote_connect_domain_event_register_ret *ret G_GNUC_UNUSED) { int callbackID; int rv = -1; @@ -4505,11 +4505,11 @@ remoteDispatchConnectDomainEventRegister(virNetServerPtr server ATTRIBUTE_UNUSED } static int -remoteDispatchConnectDomainEventDeregister(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectDomainEventDeregister(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, - remote_connect_domain_event_deregister_ret *ret ATTRIBUTE_UNUSED) + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED, + remote_connect_domain_event_deregister_ret *ret G_GNUC_UNUSED) { int callbackID = -1; int rv = -1; @@ -4590,9 +4590,9 @@ remoteDispatchObjectEventSend(virNetServerClientPtr client, } static int -remoteDispatchSecretGetValue(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchSecretGetValue(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_secret_get_value_args *args, remote_secret_get_value_ret *ret) @@ -4625,9 +4625,9 @@ remoteDispatchSecretGetValue(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainGetState(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetState(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_state_args *args, remote_domain_get_state_ret *ret) @@ -4661,10 +4661,10 @@ remoteDispatchDomainGetState(virNetServerPtr server ATTRIBUTE_UNUSED, * VIR_DRV_SUPPORTS_FEATURE(VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK), * and must not mix the two styles. */ static int -remoteDispatchConnectDomainEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectDomainEventRegisterAny(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED, remote_connect_domain_event_register_any_args *args) { int callbackID; @@ -4734,10 +4734,10 @@ remoteDispatchConnectDomainEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNU static int -remoteDispatchConnectDomainEventCallbackRegisterAny(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectDomainEventCallbackRegisterAny(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED, remote_connect_domain_event_callback_register_any_args *args, remote_connect_domain_event_callback_register_any_ret *ret) { @@ -4810,10 +4810,10 @@ remoteDispatchConnectDomainEventCallbackRegisterAny(virNetServerPtr server ATTRI static int -remoteDispatchConnectDomainEventDeregisterAny(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectDomainEventDeregisterAny(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED, remote_connect_domain_event_deregister_any_args *args) { int callbackID = -1; @@ -4867,10 +4867,10 @@ remoteDispatchConnectDomainEventDeregisterAny(virNetServerPtr server ATTRIBUTE_U static int -remoteDispatchConnectDomainEventCallbackDeregisterAny(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectDomainEventCallbackDeregisterAny(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED, remote_connect_domain_event_callback_deregister_any_args *args) { int rv = -1; @@ -4912,9 +4912,9 @@ remoteDispatchConnectDomainEventCallbackDeregisterAny(virNetServerPtr server ATT static int -qemuDispatchDomainMonitorCommand(virNetServerPtr server ATTRIBUTE_UNUSED, +qemuDispatchDomainMonitorCommand(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, qemu_domain_monitor_command_args *args, qemu_domain_monitor_command_ret *ret) @@ -4944,9 +4944,9 @@ qemuDispatchDomainMonitorCommand(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchDomainMigrateBegin3(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMigrateBegin3(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_begin3_args *args, remote_domain_migrate_begin3_ret *ret) @@ -4992,9 +4992,9 @@ remoteDispatchDomainMigrateBegin3(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchDomainMigratePrepare3(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMigratePrepare3(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_prepare3_args *args, remote_domain_migrate_prepare3_ret *ret) @@ -5045,9 +5045,9 @@ remoteDispatchDomainMigratePrepare3(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchDomainMigratePerform3(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMigratePerform3(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_perform3_args *args, remote_domain_migrate_perform3_ret *ret) @@ -5097,9 +5097,9 @@ remoteDispatchDomainMigratePerform3(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchDomainMigrateFinish3(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMigrateFinish3(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_finish3_args *args, remote_domain_migrate_finish3_ret *ret) @@ -5148,9 +5148,9 @@ remoteDispatchDomainMigrateFinish3(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchDomainMigrateConfirm3(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMigrateConfirm3(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_confirm3_args *args) { @@ -5180,9 +5180,9 @@ remoteDispatchDomainMigrateConfirm3(virNetServerPtr server ATTRIBUTE_UNUSED, } -static int remoteDispatchConnectSupportsFeature(virNetServerPtr server ATTRIBUTE_UNUSED, +static int remoteDispatchConnectSupportsFeature(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_connect_supports_feature_args *args, remote_connect_supports_feature_ret *ret) @@ -5244,7 +5244,7 @@ static int remoteDispatchConnectSupportsFeature(virNetServerPtr server ATTRIBUTE static int -remoteDispatchDomainOpenGraphics(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainOpenGraphics(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, virNetMessagePtr msg, virNetMessageErrorPtr rerr, @@ -5282,7 +5282,7 @@ remoteDispatchDomainOpenGraphics(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchDomainOpenGraphicsFd(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainOpenGraphicsFd(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, virNetMessagePtr msg, virNetMessageErrorPtr rerr, @@ -5322,9 +5322,9 @@ remoteDispatchDomainOpenGraphicsFd(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchDomainGetInterfaceParameters(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetInterfaceParameters(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_interface_parameters_args *args, remote_domain_get_interface_parameters_ret *ret) @@ -5383,9 +5383,9 @@ remoteDispatchDomainGetInterfaceParameters(virNetServerPtr server ATTRIBUTE_UNUS } static int -remoteDispatchDomainGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetCPUStats(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr hdr ATTRIBUTE_UNUSED, + virNetMessagePtr hdr G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_cpu_stats_args *args, remote_domain_get_cpu_stats_ret *ret) @@ -5452,9 +5452,9 @@ remoteDispatchDomainGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainGetDiskErrors(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetDiskErrors(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_disk_errors_args *args, remote_domain_get_disk_errors_ret *ret) @@ -5510,9 +5510,9 @@ remoteDispatchDomainGetDiskErrors(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchNodeGetSevInfo(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNodeGetSevInfo(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_node_get_sev_info_args *args, remote_node_get_sev_info_ret *ret) @@ -5546,9 +5546,9 @@ remoteDispatchNodeGetSevInfo(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchNodeGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNodeGetMemoryParameters(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_node_get_memory_parameters_args *args, remote_node_get_memory_parameters_ret *ret) @@ -5601,9 +5601,9 @@ remoteDispatchNodeGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchNodeGetCPUMap(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNodeGetCPUMap(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_node_get_cpu_map_args *args, remote_node_get_cpu_map_ret *ret) @@ -5645,9 +5645,9 @@ remoteDispatchNodeGetCPUMap(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -lxcDispatchDomainOpenNamespace(virNetServerPtr server ATTRIBUTE_UNUSED, +lxcDispatchDomainOpenNamespace(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, lxc_domain_open_namespace_args *args) { @@ -5692,9 +5692,9 @@ lxcDispatchDomainOpenNamespace(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainGetJobStats(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetJobStats(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_job_stats_args *args, remote_domain_get_job_stats_ret *ret) @@ -5733,9 +5733,9 @@ remoteDispatchDomainGetJobStats(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainMigrateBegin3Params(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMigrateBegin3Params(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_begin3_params_args *args, remote_domain_migrate_begin3_params_ret *ret) @@ -5787,9 +5787,9 @@ remoteDispatchDomainMigrateBegin3Params(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -remoteDispatchDomainMigratePrepare3Params(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMigratePrepare3Params(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_prepare3_params_args *args, remote_domain_migrate_prepare3_params_ret *ret) @@ -5844,7 +5844,7 @@ remoteDispatchDomainMigratePrepare3Params(virNetServerPtr server ATTRIBUTE_UNUSE } static int -remoteDispatchDomainMigratePrepareTunnel3Params(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMigratePrepareTunnel3Params(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, virNetMessagePtr msg, virNetMessageErrorPtr rerr, @@ -5911,9 +5911,9 @@ remoteDispatchDomainMigratePrepareTunnel3Params(virNetServerPtr server ATTRIBUTE static int -remoteDispatchDomainMigratePerform3Params(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMigratePerform3Params(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_perform3_params_args *args, remote_domain_migrate_perform3_params_ret *ret) @@ -5969,9 +5969,9 @@ remoteDispatchDomainMigratePerform3Params(virNetServerPtr server ATTRIBUTE_UNUSE static int -remoteDispatchDomainMigrateFinish3Params(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMigrateFinish3Params(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_finish3_params_args *args, remote_domain_migrate_finish3_params_ret *ret) @@ -6027,9 +6027,9 @@ remoteDispatchDomainMigrateFinish3Params(virNetServerPtr server ATTRIBUTE_UNUSED static int -remoteDispatchDomainMigrateConfirm3Params(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMigrateConfirm3Params(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_confirm3_params_args *args) { @@ -6075,9 +6075,9 @@ remoteDispatchDomainMigrateConfirm3Params(virNetServerPtr server ATTRIBUTE_UNUSE static int -remoteDispatchConnectGetCPUModelNames(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectGetCPUModelNames(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_connect_get_cpu_model_names_args *args, remote_connect_get_cpu_model_names_ret *ret) @@ -6124,9 +6124,9 @@ remoteDispatchConnectGetCPUModelNames(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchDomainCreateXMLWithFiles(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainCreateXMLWithFiles(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_create_xml_with_files_args *args, remote_domain_create_xml_with_files_ret *ret) @@ -6170,9 +6170,9 @@ remoteDispatchDomainCreateXMLWithFiles(virNetServerPtr server ATTRIBUTE_UNUSED, } -static int remoteDispatchDomainCreateWithFiles(virNetServerPtr server ATTRIBUTE_UNUSED, +static int remoteDispatchDomainCreateWithFiles(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_create_with_files_args *args, remote_domain_create_with_files_ret *ret) @@ -6220,10 +6220,10 @@ static int remoteDispatchDomainCreateWithFiles(virNetServerPtr server ATTRIBUTE_ static int -remoteDispatchConnectNetworkEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectNetworkEventRegisterAny(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED, remote_connect_network_event_register_any_args *args, remote_connect_network_event_register_any_ret *ret) { @@ -6296,10 +6296,10 @@ remoteDispatchConnectNetworkEventRegisterAny(virNetServerPtr server ATTRIBUTE_UN static int -remoteDispatchConnectNetworkEventDeregisterAny(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectNetworkEventDeregisterAny(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED, remote_connect_network_event_deregister_any_args *args) { int rv = -1; @@ -6340,10 +6340,10 @@ remoteDispatchConnectNetworkEventDeregisterAny(virNetServerPtr server ATTRIBUTE_ } static int -remoteDispatchConnectStoragePoolEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectStoragePoolEventRegisterAny(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED, remote_connect_storage_pool_event_register_any_args *args, remote_connect_storage_pool_event_register_any_ret *ret) { @@ -6415,10 +6415,10 @@ remoteDispatchConnectStoragePoolEventRegisterAny(virNetServerPtr server ATTRIBUT } static int -remoteDispatchConnectStoragePoolEventDeregisterAny(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectStoragePoolEventDeregisterAny(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED, remote_connect_storage_pool_event_deregister_any_args *args) { int rv = -1; @@ -6459,10 +6459,10 @@ remoteDispatchConnectStoragePoolEventDeregisterAny(virNetServerPtr server ATTRIB } static int -remoteDispatchConnectNodeDeviceEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectNodeDeviceEventRegisterAny(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED, remote_connect_node_device_event_register_any_args *args, remote_connect_node_device_event_register_any_ret *ret) { @@ -6534,10 +6534,10 @@ remoteDispatchConnectNodeDeviceEventRegisterAny(virNetServerPtr server ATTRIBUTE } static int -remoteDispatchConnectNodeDeviceEventDeregisterAny(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectNodeDeviceEventDeregisterAny(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED, remote_connect_node_device_event_deregister_any_args *args) { int rv = -1; @@ -6578,10 +6578,10 @@ remoteDispatchConnectNodeDeviceEventDeregisterAny(virNetServerPtr server ATTRIBU } static int -remoteDispatchConnectSecretEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectSecretEventRegisterAny(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED, remote_connect_secret_event_register_any_args *args, remote_connect_secret_event_register_any_ret *ret) { @@ -6653,10 +6653,10 @@ remoteDispatchConnectSecretEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNU } static int -remoteDispatchConnectSecretEventDeregisterAny(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectSecretEventDeregisterAny(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED, remote_connect_secret_event_deregister_any_args *args) { int rv = -1; @@ -6697,10 +6697,10 @@ remoteDispatchConnectSecretEventDeregisterAny(virNetServerPtr server ATTRIBUTE_U } static int -qemuDispatchConnectDomainMonitorEventRegister(virNetServerPtr server ATTRIBUTE_UNUSED, +qemuDispatchConnectDomainMonitorEventRegister(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED, qemu_connect_domain_monitor_event_register_args *args, qemu_connect_domain_monitor_event_register_ret *ret) { @@ -6769,10 +6769,10 @@ qemuDispatchConnectDomainMonitorEventRegister(virNetServerPtr server ATTRIBUTE_U static int -qemuDispatchConnectDomainMonitorEventDeregister(virNetServerPtr server ATTRIBUTE_UNUSED, +qemuDispatchConnectDomainMonitorEventDeregister(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED, qemu_connect_domain_monitor_event_deregister_args *args) { int rv = -1; @@ -6814,9 +6814,9 @@ qemuDispatchConnectDomainMonitorEventDeregister(virNetServerPtr server ATTRIBUTE } static int -remoteDispatchDomainGetTime(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetTime(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_time_args *args, remote_domain_get_time_ret *ret) @@ -6849,9 +6849,9 @@ remoteDispatchDomainGetTime(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchNodeGetFreePages(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNodeGetFreePages(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_node_get_free_pages_args *args, remote_node_get_free_pages_ret *ret) @@ -6959,9 +6959,9 @@ remoteSerializeDHCPLease(remote_network_dhcp_lease *lease_dst, virNetworkDHCPLea static int -remoteDispatchNetworkGetDHCPLeases(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNetworkGetDHCPLeases(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_network_get_dhcp_leases_args *args, remote_network_get_dhcp_leases_ret *ret) @@ -7025,9 +7025,9 @@ remoteDispatchNetworkGetDHCPLeases(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchConnectGetAllDomainStats(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectGetAllDomainStats(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_connect_get_all_domain_stats_args *args, remote_connect_get_all_domain_stats_ret *ret) @@ -7114,9 +7114,9 @@ remoteDispatchConnectGetAllDomainStats(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchNodeAllocPages(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNodeAllocPages(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_node_alloc_pages_args *args, remote_node_alloc_pages_ret *ret) @@ -7148,9 +7148,9 @@ remoteDispatchNodeAllocPages(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchDomainGetFSInfo(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetFSInfo(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_fsinfo_args *args, remote_domain_get_fsinfo_ret *ret) @@ -7340,9 +7340,9 @@ remoteSerializeDomainInterface(virDomainInterfacePtr *ifaces, static int -remoteDispatchDomainInterfaceAddresses(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainInterfaceAddresses(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_interface_addresses_args *args, remote_domain_interface_addresses_ret *ret) @@ -7385,9 +7385,9 @@ remoteDispatchDomainInterfaceAddresses(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchStorageVolGetInfoFlags(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchStorageVolGetInfoFlags(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_storage_vol_get_info_flags_args *args, remote_storage_vol_get_info_flags_ret *ret) @@ -7420,9 +7420,9 @@ remoteDispatchStorageVolGetInfoFlags(virNetServerPtr server ATTRIBUTE_UNUSED, static int -remoteDispatchNetworkPortGetParameters(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNetworkPortGetParameters(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_network_port_get_parameters_args *args, remote_network_port_get_parameters_ret *ret) @@ -7720,9 +7720,9 @@ remoteSerializeDomainDiskErrors(virDomainDiskErrorPtr errors, } static int -remoteDispatchDomainGetGuestInfo(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetGuestInfo(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_guest_info_args *args, remote_domain_get_guest_info_ret *ret) diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_stream.c index 1f6e783881..d7fcb1bf42 100644 --- a/src/remote/remote_daemon_stream.c +++ b/src/remote/remote_daemon_stream.c @@ -284,7 +284,7 @@ daemonStreamEvent(virStreamPtr st, int events, void *opaque) * -1 on fatal client error */ static int -daemonStreamFilter(virNetServerClientPtr client ATTRIBUTE_UNUSED, +daemonStreamFilter(virNetServerClientPtr client G_GNUC_UNUSED, virNetMessagePtr msg, void *opaque) { diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 877250d40c..3191f9032e 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -236,9 +236,9 @@ static int remoteSplitURIScheme(virURIPtr uri, static int -remoteStateInitialize(bool privileged ATTRIBUTE_UNUSED, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +remoteStateInitialize(bool privileged G_GNUC_UNUSED, + virStateInhibitCallback callback G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { /* Mark that we're inside the daemon so we can avoid * re-entering ourselves @@ -249,21 +249,21 @@ remoteStateInitialize(bool privileged ATTRIBUTE_UNUSED, static void -remoteDomainBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); static void -remoteDomainBuildEventCallbackLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); static void -remoteDomainBuildEventReboot(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventReboot(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); static void -remoteDomainBuildEventCallbackReboot(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackReboot(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); static void @@ -432,38 +432,38 @@ remoteDomainBuildEventCallbackMetadataChange(virNetClientProgramPtr prog, void *evdata, void *opaque); static void -remoteNetworkBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteNetworkBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); static void -remoteStoragePoolBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteStoragePoolBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); static void -remoteStoragePoolBuildEventRefresh(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteStoragePoolBuildEventRefresh(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); static void -remoteNodeDeviceBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteNodeDeviceBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); static void -remoteNodeDeviceBuildEventUpdate(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteNodeDeviceBuildEventUpdate(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); static void -remoteSecretBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteSecretBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); static void -remoteSecretBuildEventValueChanged(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteSecretBuildEventValueChanged(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); static void @@ -472,8 +472,8 @@ remoteDomainBuildEventBlockThreshold(virNetClientProgramPtr prog, void *evdata, void *opaque); static void -remoteConnectNotifyEventConnectionClosed(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteConnectNotifyEventConnectionClosed(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); static virNetClientProgramEvent remoteEvents[] = { @@ -685,8 +685,8 @@ static virNetClientProgramEvent remoteEvents[] = { }; static void -remoteConnectNotifyEventConnectionClosed(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteConnectNotifyEventConnectionClosed(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -697,8 +697,8 @@ remoteConnectNotifyEventConnectionClosed(virNetClientProgramPtr prog ATTRIBUTE_U } static void -remoteDomainBuildQemuMonitorEvent(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildQemuMonitorEvent(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); static virNetClientProgramEvent qemuEvents[] = { @@ -716,7 +716,7 @@ enum virDrvOpenRemoteFlags { static void -remoteClientCloseFunc(virNetClientPtr client ATTRIBUTE_UNUSED, +remoteClientCloseFunc(virNetClientPtr client G_GNUC_UNUSED, int reason, void *opaque) { @@ -939,7 +939,7 @@ doRemoteOpen(virConnectPtr conn, struct private_data *priv, const char *driver_str, const char *transport_str, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, virConfPtr conf, unsigned int flags) { @@ -3841,7 +3841,7 @@ remoteNodeDeviceReset(virNodeDevicePtr dev) static int remoteAuthenticate(virConnectPtr conn, struct private_data *priv, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, const char *authtype) { struct remote_auth_list_ret ret; @@ -4485,7 +4485,7 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv, static int remoteAuthPolkit(virConnectPtr conn, struct private_data *priv, - virConnectAuthPtr auth ATTRIBUTE_UNUSED) + virConnectAuthPtr auth G_GNUC_UNUSED) { remote_auth_polkit_ret ret; VIR_DEBUG("Client initialize PolicyKit authentication"); @@ -4631,8 +4631,8 @@ remoteDomainBuildEventLifecycleHelper(virConnectPtr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -4640,8 +4640,8 @@ remoteDomainBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, remoteDomainBuildEventLifecycleHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -4669,8 +4669,8 @@ remoteDomainBuildEventRebootHelper(virConnectPtr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventReboot(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventReboot(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -4678,8 +4678,8 @@ remoteDomainBuildEventReboot(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, remoteDomainBuildEventRebootHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackReboot(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackReboot(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -4706,8 +4706,8 @@ remoteDomainBuildEventRTCChangeHelper(virConnectPtr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventRTCChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventRTCChange(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -4715,8 +4715,8 @@ remoteDomainBuildEventRTCChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, remoteDomainBuildEventRTCChangeHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackRTCChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackRTCChange(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -4743,8 +4743,8 @@ remoteDomainBuildEventWatchdogHelper(virConnectPtr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventWatchdog(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventWatchdog(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -4752,8 +4752,8 @@ remoteDomainBuildEventWatchdog(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, remoteDomainBuildEventWatchdogHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackWatchdog(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackWatchdog(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -4783,8 +4783,8 @@ remoteDomainBuildEventIOErrorHelper(virConnectPtr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventIOError(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventIOError(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -4792,8 +4792,8 @@ remoteDomainBuildEventIOError(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, remoteDomainBuildEventIOErrorHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackIOError(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackIOError(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -4825,8 +4825,8 @@ remoteDomainBuildEventIOErrorReasonHelper(virConnectPtr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventIOErrorReason(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventIOErrorReason(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -4834,8 +4834,8 @@ remoteDomainBuildEventIOErrorReason(virNetClientProgramPtr prog ATTRIBUTE_UNUSED remoteDomainBuildEventIOErrorReasonHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackIOErrorReason(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackIOErrorReason(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -4864,8 +4864,8 @@ remoteDomainBuildEventBlockJobHelper(virConnectPtr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventBlockJob(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventBlockJob(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -4873,8 +4873,8 @@ remoteDomainBuildEventBlockJob(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, remoteDomainBuildEventBlockJobHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackBlockJob(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackBlockJob(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -4882,8 +4882,8 @@ remoteDomainBuildEventCallbackBlockJob(virNetClientProgramPtr prog ATTRIBUTE_UNU remoteDomainBuildEventBlockJobHelper(conn, &msg->msg, msg->callbackID); } static void -remoteDomainBuildEventBlockJob2(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventBlockJob2(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -4981,8 +4981,8 @@ remoteDomainBuildEventGraphicsHelper(virConnectPtr conn, return; } static void -remoteDomainBuildEventGraphics(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventGraphics(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -4990,8 +4990,8 @@ remoteDomainBuildEventGraphics(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, remoteDomainBuildEventGraphicsHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackGraphics(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackGraphics(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5019,8 +5019,8 @@ remoteDomainBuildEventControlErrorHelper(virConnectPtr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventControlError(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventControlError(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5028,8 +5028,8 @@ remoteDomainBuildEventControlError(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, remoteDomainBuildEventControlErrorHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackControlError(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackControlError(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5062,8 +5062,8 @@ remoteDomainBuildEventDiskChangeHelper(virConnectPtr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventDiskChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventDiskChange(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5071,8 +5071,8 @@ remoteDomainBuildEventDiskChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, remoteDomainBuildEventDiskChangeHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackDiskChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackDiskChange(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5103,8 +5103,8 @@ remoteDomainBuildEventTrayChangeHelper(virConnectPtr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventTrayChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventTrayChange(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5112,8 +5112,8 @@ remoteDomainBuildEventTrayChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, remoteDomainBuildEventTrayChangeHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackTrayChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackTrayChange(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5142,8 +5142,8 @@ remoteDomainBuildEventPMWakeupHelper(virConnectPtr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventPMWakeup(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventPMWakeup(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5151,8 +5151,8 @@ remoteDomainBuildEventPMWakeup(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, remoteDomainBuildEventPMWakeupHelper(conn, msg, -1, 0); } static void -remoteDomainBuildEventCallbackPMWakeup(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackPMWakeup(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5182,8 +5182,8 @@ remoteDomainBuildEventPMSuspendHelper(virConnectPtr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventPMSuspend(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventPMSuspend(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5191,8 +5191,8 @@ remoteDomainBuildEventPMSuspend(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, remoteDomainBuildEventPMSuspendHelper(conn, msg, -1, 0); } static void -remoteDomainBuildEventCallbackPMSuspend(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackPMSuspend(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5221,8 +5221,8 @@ remoteDomainBuildEventBalloonChangeHelper(virConnectPtr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventBalloonChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventBalloonChange(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5230,8 +5230,8 @@ remoteDomainBuildEventBalloonChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED remoteDomainBuildEventBalloonChangeHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackBalloonChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackBalloonChange(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5261,8 +5261,8 @@ remoteDomainBuildEventPMSuspendDiskHelper(virConnectPtr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventPMSuspendDisk(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventPMSuspendDisk(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5270,8 +5270,8 @@ remoteDomainBuildEventPMSuspendDisk(virNetClientProgramPtr prog ATTRIBUTE_UNUSED remoteDomainBuildEventPMSuspendDiskHelper(conn, msg, -1, 0); } static void -remoteDomainBuildEventCallbackPMSuspendDisk(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackPMSuspendDisk(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5301,8 +5301,8 @@ remoteDomainBuildEventDeviceRemovedHelper(virConnectPtr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventDeviceRemoved(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventDeviceRemoved(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5310,8 +5310,8 @@ remoteDomainBuildEventDeviceRemoved(virNetClientProgramPtr prog ATTRIBUTE_UNUSED remoteDomainBuildEventDeviceRemovedHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackDeviceRemoved(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackDeviceRemoved(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5320,8 +5320,8 @@ remoteDomainBuildEventCallbackDeviceRemoved(virNetClientProgramPtr prog ATTRIBUT } static void -remoteDomainBuildEventCallbackDeviceAdded(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackDeviceAdded(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5343,8 +5343,8 @@ remoteDomainBuildEventCallbackDeviceAdded(virNetClientProgramPtr prog ATTRIBUTE_ static void -remoteDomainBuildEventCallbackDeviceRemovalFailed(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackDeviceRemovalFailed(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5364,8 +5364,8 @@ remoteDomainBuildEventCallbackDeviceRemovalFailed(virNetClientProgramPtr prog AT } static void -remoteDomainBuildEventCallbackTunable(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackTunable(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5397,8 +5397,8 @@ remoteDomainBuildEventCallbackTunable(virNetClientProgramPtr prog ATTRIBUTE_UNUS static void -remoteDomainBuildEventCallbackAgentLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackAgentLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5420,8 +5420,8 @@ remoteDomainBuildEventCallbackAgentLifecycle(virNetClientProgramPtr prog ATTRIBU static void -remoteDomainBuildEventCallbackMigrationIteration(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackMigrationIteration(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { @@ -5443,8 +5443,8 @@ remoteDomainBuildEventCallbackMigrationIteration(virNetClientProgramPtr prog ATT static void -remoteDomainBuildEventCallbackJobCompleted(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackJobCompleted(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { @@ -5476,8 +5476,8 @@ remoteDomainBuildEventCallbackJobCompleted(virNetClientProgramPtr prog ATTRIBUTE static void -remoteDomainBuildEventCallbackMetadataChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackMetadataChange(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5498,8 +5498,8 @@ remoteDomainBuildEventCallbackMetadataChange(virNetClientProgramPtr prog ATTRIBU static void -remoteNetworkBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteNetworkBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5520,8 +5520,8 @@ remoteNetworkBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, } static void -remoteStoragePoolBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteStoragePoolBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5542,8 +5542,8 @@ remoteStoragePoolBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSE } static void -remoteStoragePoolBuildEventRefresh(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteStoragePoolBuildEventRefresh(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5563,8 +5563,8 @@ remoteStoragePoolBuildEventRefresh(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, } static void -remoteNodeDeviceBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteNodeDeviceBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5585,8 +5585,8 @@ remoteNodeDeviceBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED } static void -remoteNodeDeviceBuildEventUpdate(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteNodeDeviceBuildEventUpdate(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5606,8 +5606,8 @@ remoteNodeDeviceBuildEventUpdate(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, } static void -remoteSecretBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteSecretBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5628,8 +5628,8 @@ remoteSecretBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, } static void -remoteSecretBuildEventValueChanged(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteSecretBuildEventValueChanged(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5649,8 +5649,8 @@ remoteSecretBuildEventValueChanged(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, } static void -remoteDomainBuildQemuMonitorEvent(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildQemuMonitorEvent(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5709,8 +5709,8 @@ remoteSecretGetValue(virSecretPtr secret, size_t *value_size, static void -remoteDomainBuildEventBlockThreshold(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventBlockThreshold(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn = opaque; @@ -5862,7 +5862,7 @@ struct remoteStreamCallbackData { virFreeCallback ff; }; -static void remoteStreamEventCallback(virNetClientStreamPtr stream ATTRIBUTE_UNUSED, +static void remoteStreamEventCallback(virNetClientStreamPtr stream G_GNUC_UNUSED, int events, void *opaque) { @@ -6769,7 +6769,7 @@ remoteDomainGetDiskErrors(virDomainPtr dom, * send that to the server and wait for reply */ static int -callFull(virConnectPtr conn ATTRIBUTE_UNUSED, +callFull(virConnectPtr conn G_GNUC_UNUSED, struct private_data *priv, unsigned int flags, int *fdin, -- 2.19.2

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/security/security_apparmor.c | 88 ++++++++-------- src/security/security_dac.c | 114 ++++++++++---------- src/security/security_manager.c | 6 +- src/security/security_nop.c | 174 +++++++++++++++---------------- src/security/security_selinux.c | 54 +++++----- src/security/security_stack.c | 8 +- src/security/security_util.c | 6 +- src/security/virt-aa-helper.c | 4 +- 8 files changed, 227 insertions(+), 227 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 77eee9410c..da4aa3c24d 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -163,7 +163,7 @@ profile_status_file(const char *str) * load (add) a profile. Will create one if necessary */ static int -load_profile(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +load_profile(virSecurityManagerPtr mgr G_GNUC_UNUSED, const char *profile, virDomainDefPtr def, const char *fn, @@ -321,28 +321,28 @@ AppArmorSetSecurityHostdevLabelHelper(const char *file, void *opaque) } static int -AppArmorSetSecurityUSBLabel(virUSBDevicePtr dev ATTRIBUTE_UNUSED, +AppArmorSetSecurityUSBLabel(virUSBDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { return AppArmorSetSecurityHostdevLabelHelper(file, opaque); } static int -AppArmorSetSecurityPCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED, +AppArmorSetSecurityPCILabel(virPCIDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { return AppArmorSetSecurityHostdevLabelHelper(file, opaque); } static int -AppArmorSetSecuritySCSILabel(virSCSIDevicePtr dev ATTRIBUTE_UNUSED, +AppArmorSetSecuritySCSILabel(virSCSIDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { return AppArmorSetSecurityHostdevLabelHelper(file, opaque); } static int -AppArmorSetSecurityHostLabel(virSCSIVHostDevicePtr dev ATTRIBUTE_UNUSED, +AppArmorSetSecurityHostLabel(virSCSIVHostDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { return AppArmorSetSecurityHostdevLabelHelper(file, opaque); @@ -350,7 +350,7 @@ AppArmorSetSecurityHostLabel(virSCSIVHostDevicePtr dev ATTRIBUTE_UNUSED, /* Called on libvirtd startup to see if AppArmor is available */ static int -AppArmorSecurityManagerProbe(const char *virtDriver ATTRIBUTE_UNUSED) +AppArmorSecurityManagerProbe(const char *virtDriver G_GNUC_UNUSED) { char *template_qemu = NULL; char *template_lxc = NULL; @@ -391,25 +391,25 @@ AppArmorSecurityManagerProbe(const char *virtDriver ATTRIBUTE_UNUSED) * currently not used. */ static int -AppArmorSecurityManagerOpen(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +AppArmorSecurityManagerOpen(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return 0; } static int -AppArmorSecurityManagerClose(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +AppArmorSecurityManagerClose(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return 0; } static const char * -AppArmorSecurityManagerGetModel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +AppArmorSecurityManagerGetModel(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return SECURITY_APPARMOR_NAME; } static const char * -AppArmorSecurityManagerGetDOI(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +AppArmorSecurityManagerGetDOI(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return SECURITY_APPARMOR_VOID_DOI; } @@ -421,7 +421,7 @@ AppArmorSecurityManagerGetDOI(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) * called on shutdown. */ static int -AppArmorGenSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +AppArmorGenSecurityLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def) { int rc = -1; @@ -488,7 +488,7 @@ static int AppArmorSetSecurityAllLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, const char *stdin_path, - bool chardevStdioLogd ATTRIBUTE_UNUSED) + bool chardevStdioLogd G_GNUC_UNUSED) { virSecurityLabelDefPtr secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_APPARMOR_NAME); @@ -507,9 +507,9 @@ AppArmorSetSecurityAllLabel(virSecurityManagerPtr mgr, * running. */ static int -AppArmorGetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +AppArmorGetSecurityProcessLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def, - pid_t pid ATTRIBUTE_UNUSED, + pid_t pid G_GNUC_UNUSED, virSecurityLabelPtr sec) { int rc = -1; @@ -547,7 +547,7 @@ AppArmorGetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, * more details. Currently called via qemudShutdownVMDaemon. */ static int -AppArmorReleaseSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +AppArmorReleaseSecurityLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def) { virSecurityLabelDefPtr secdef = virDomainDefGetSecurityLabelDef(def, @@ -563,10 +563,10 @@ AppArmorReleaseSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, static int -AppArmorRestoreSecurityAllLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +AppArmorRestoreSecurityAllLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def, - bool migrated ATTRIBUTE_UNUSED, - bool chardevStdioLogd ATTRIBUTE_UNUSED) + bool migrated G_GNUC_UNUSED, + bool chardevStdioLogd G_GNUC_UNUSED) { int rc = 0; virSecurityLabelDefPtr secdef = @@ -589,7 +589,7 @@ AppArmorRestoreSecurityAllLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, * LOCALSTATEDIR/log/libvirt/qemu/<vm name>.log */ static int -AppArmorSetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +AppArmorSetSecurityProcessLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def) { int rc = -1; @@ -633,7 +633,7 @@ AppArmorSetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, * process*. */ static int -AppArmorSetSecurityChildProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +AppArmorSetSecurityChildProcessLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def, virCommandPtr cmd) { @@ -671,22 +671,22 @@ AppArmorSetSecurityChildProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, } static int -AppArmorSetSecurityDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +AppArmorSetSecurityDaemonSocketLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED) { return 0; } static int -AppArmorSetSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED) +AppArmorSetSecuritySocketLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED) { return 0; } static int -AppArmorClearSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED) +AppArmorClearSecuritySocketLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED) { return 0; } @@ -697,7 +697,7 @@ static int AppArmorRestoreSecurityImageLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, virStorageSourcePtr src, - virSecurityDomainImageLabelFlags flags ATTRIBUTE_UNUSED) + virSecurityDomainImageLabelFlags flags G_GNUC_UNUSED) { if (!virStorageSourceIsLocalStorage(src)) return 0; @@ -744,7 +744,7 @@ AppArmorSetMemoryLabel(virSecurityManagerPtr mgr, static int AppArmorRestoreMemoryLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, - virDomainMemoryDefPtr mem ATTRIBUTE_UNUSED) + virDomainMemoryDefPtr mem G_GNUC_UNUSED) { return reload_profile(mgr, def, NULL, false); } @@ -789,7 +789,7 @@ AppArmorSetInputLabel(virSecurityManagerPtr mgr, static int AppArmorRestoreInputLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, - virDomainInputDefPtr input ATTRIBUTE_UNUSED) + virDomainInputDefPtr input G_GNUC_UNUSED) { return reload_profile(mgr, def, NULL, false); } @@ -799,7 +799,7 @@ static int AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, virStorageSourcePtr src, - virSecurityDomainImageLabelFlags flags ATTRIBUTE_UNUSED) + virSecurityDomainImageLabelFlags flags G_GNUC_UNUSED) { int rc = -1; char *profile_name = NULL; @@ -845,7 +845,7 @@ AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr, } static int -AppArmorSecurityVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +AppArmorSecurityVerify(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def) { virSecurityLabelDefPtr secdef = @@ -866,9 +866,9 @@ AppArmorSecurityVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, } static int -AppArmorReserveSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - pid_t pid ATTRIBUTE_UNUSED) +AppArmorReserveSecurityLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + pid_t pid G_GNUC_UNUSED) { /* NOOP. Nothing to reserve with AppArmor */ return 0; @@ -1003,8 +1003,8 @@ AppArmorSetSecurityHostdevLabel(virSecurityManagerPtr mgr, static int AppArmorRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, - virDomainHostdevDefPtr dev ATTRIBUTE_UNUSED, - const char *vroot ATTRIBUTE_UNUSED) + virDomainHostdevDefPtr dev G_GNUC_UNUSED, + const char *vroot G_GNUC_UNUSED) { virSecurityLabelDefPtr secdef = @@ -1020,7 +1020,7 @@ static int AppArmorSetChardevLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, virDomainChrSourceDefPtr dev_source, - bool chardevStdioLogd ATTRIBUTE_UNUSED) + bool chardevStdioLogd G_GNUC_UNUSED) { char *in = NULL, *out = NULL; int ret = -1; @@ -1075,8 +1075,8 @@ AppArmorSetChardevLabel(virSecurityManagerPtr mgr, static int AppArmorRestoreChardevLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, - virDomainChrSourceDefPtr dev_source ATTRIBUTE_UNUSED, - bool chardevStdioLogd ATTRIBUTE_UNUSED) + virDomainChrSourceDefPtr dev_source G_GNUC_UNUSED, + bool chardevStdioLogd G_GNUC_UNUSED) { virSecurityLabelDefPtr secdef; @@ -1119,7 +1119,7 @@ AppArmorSetPathLabel(virSecurityManagerPtr mgr, static int AppArmorRestoreSavedStateLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, - const char *savefile ATTRIBUTE_UNUSED) + const char *savefile G_GNUC_UNUSED) { return reload_profile(mgr, def, NULL, false); } @@ -1152,8 +1152,8 @@ AppArmorSetFDLabel(virSecurityManagerPtr mgr, } static char * -AppArmorGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +AppArmorGetMountOptions(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED) { char *opts; @@ -1162,8 +1162,8 @@ AppArmorGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, } static const char * -AppArmorGetBaseLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - int virtType ATTRIBUTE_UNUSED) +AppArmorGetBaseLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + int virtType G_GNUC_UNUSED) { return NULL; } diff --git a/src/security/security_dac.c b/src/security/security_dac.c index d6d0a8299b..250e6357b1 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -216,7 +216,7 @@ static int virSecurityDACRestoreFileLabelInternal(virSecurityManagerPtr mgr, * -1 otherwise. */ static int -virSecurityDACTransactionRun(pid_t pid ATTRIBUTE_UNUSED, +virSecurityDACTransactionRun(pid_t pid G_GNUC_UNUSED, void *opaque) { virSecurityDACChownListPtr list = opaque; @@ -432,7 +432,7 @@ virSecurityDACGetImageIds(virSecurityLabelDefPtr seclabel, * -1 on failure */ static int -virSecurityDACRememberLabel(virSecurityDACDataPtr priv ATTRIBUTE_UNUSED, +virSecurityDACRememberLabel(virSecurityDACDataPtr priv G_GNUC_UNUSED, const char *path, uid_t uid, gid_t gid) @@ -466,7 +466,7 @@ virSecurityDACRememberLabel(virSecurityDACDataPtr priv ATTRIBUTE_UNUSED, * -1 on failure (@uid and @gid not touched) */ static int -virSecurityDACRecallLabel(virSecurityDACDataPtr priv ATTRIBUTE_UNUSED, +virSecurityDACRecallLabel(virSecurityDACDataPtr priv G_GNUC_UNUSED, const char *path, uid_t *uid, gid_t *gid) @@ -492,13 +492,13 @@ virSecurityDACRecallLabel(virSecurityDACDataPtr priv ATTRIBUTE_UNUSED, } static virSecurityDriverStatus -virSecurityDACProbe(const char *virtDriver ATTRIBUTE_UNUSED) +virSecurityDACProbe(const char *virtDriver G_GNUC_UNUSED) { return SECURITY_DRIVER_ENABLE; } static int -virSecurityDACOpen(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityDACOpen(virSecurityManagerPtr mgr G_GNUC_UNUSED) { if (virThreadLocalInit(&chownList, virSecurityDACChownListFree) < 0) { @@ -521,13 +521,13 @@ virSecurityDACClose(virSecurityManagerPtr mgr) static const char * -virSecurityDACGetModel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityDACGetModel(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return SECURITY_DAC_NAME; } static const char * -virSecurityDACGetDOI(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityDACGetDOI(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return "0"; } @@ -609,7 +609,7 @@ virSecurityDACTransactionStart(virSecurityManagerPtr mgr) * -1 otherwise. */ static int -virSecurityDACTransactionCommit(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +virSecurityDACTransactionCommit(virSecurityManagerPtr mgr G_GNUC_UNUSED, pid_t pid, bool lock) { @@ -659,7 +659,7 @@ virSecurityDACTransactionCommit(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, * Cancels and frees any out standing transaction. */ static void -virSecurityDACTransactionAbort(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityDACTransactionAbort(virSecurityManagerPtr mgr G_GNUC_UNUSED) { virSecurityDACChownListPtr list; @@ -1051,7 +1051,7 @@ static int virSecurityDACRestoreImageLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, virStorageSourcePtr src, - virSecurityDomainImageLabelFlags flags ATTRIBUTE_UNUSED) + virSecurityDomainImageLabelFlags flags G_GNUC_UNUSED) { return virSecurityDACRestoreImageLabelInt(mgr, def, src, false); } @@ -1065,7 +1065,7 @@ struct virSecurityDACMoveImageMetadataData { static int -virSecurityDACMoveImageMetadataHelper(pid_t pid ATTRIBUTE_UNUSED, +virSecurityDACMoveImageMetadataHelper(pid_t pid G_GNUC_UNUSED, void *opaque) { struct virSecurityDACMoveImageMetadataData *data = opaque; @@ -1137,7 +1137,7 @@ virSecurityDACSetHostdevLabelHelper(const char *file, static int -virSecurityDACSetPCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED, +virSecurityDACSetPCILabel(virPCIDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -1146,7 +1146,7 @@ virSecurityDACSetPCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED, static int -virSecurityDACSetUSBLabel(virUSBDevicePtr dev ATTRIBUTE_UNUSED, +virSecurityDACSetUSBLabel(virUSBDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -1155,7 +1155,7 @@ virSecurityDACSetUSBLabel(virUSBDevicePtr dev ATTRIBUTE_UNUSED, static int -virSecurityDACSetSCSILabel(virSCSIDevicePtr dev ATTRIBUTE_UNUSED, +virSecurityDACSetSCSILabel(virSCSIDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -1164,7 +1164,7 @@ virSecurityDACSetSCSILabel(virSCSIDevicePtr dev ATTRIBUTE_UNUSED, static int -virSecurityDACSetHostLabel(virSCSIVHostDevicePtr dev ATTRIBUTE_UNUSED, +virSecurityDACSetHostLabel(virSCSIVHostDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -1305,7 +1305,7 @@ virSecurityDACSetHostdevLabel(virSecurityManagerPtr mgr, static int -virSecurityDACRestorePCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED, +virSecurityDACRestorePCILabel(virPCIDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -1315,7 +1315,7 @@ virSecurityDACRestorePCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED, static int -virSecurityDACRestoreUSBLabel(virUSBDevicePtr dev ATTRIBUTE_UNUSED, +virSecurityDACRestoreUSBLabel(virUSBDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -1325,7 +1325,7 @@ virSecurityDACRestoreUSBLabel(virUSBDevicePtr dev ATTRIBUTE_UNUSED, static int -virSecurityDACRestoreSCSILabel(virSCSIDevicePtr dev ATTRIBUTE_UNUSED, +virSecurityDACRestoreSCSILabel(virSCSIDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -1335,7 +1335,7 @@ virSecurityDACRestoreSCSILabel(virSCSIDevicePtr dev ATTRIBUTE_UNUSED, static int -virSecurityDACRestoreHostLabel(virSCSIVHostDevicePtr dev ATTRIBUTE_UNUSED, +virSecurityDACRestoreHostLabel(virSCSIVHostDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -1577,7 +1577,7 @@ virSecurityDACSetChardevLabel(virSecurityManagerPtr mgr, static int virSecurityDACRestoreChardevLabelHelper(virSecurityManagerPtr mgr, - virDomainDefPtr def ATTRIBUTE_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, virDomainChrSourceDefPtr dev_source, bool chardevStdioLogd, bool recall) @@ -1671,7 +1671,7 @@ struct _virSecuritySELinuxChardevCallbackData { static int virSecurityDACRestoreChardevCallback(virDomainDefPtr def, - virDomainChrDefPtr dev ATTRIBUTE_UNUSED, + virDomainChrDefPtr dev G_GNUC_UNUSED, void *opaque) { struct _virSecuritySELinuxChardevCallbackData *data = opaque; @@ -1765,9 +1765,9 @@ virSecurityDACSetGraphicsLabel(virSecurityManagerPtr mgr, static int -virSecurityDACRestoreGraphicsLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainGraphicsDefPtr gfx ATTRIBUTE_UNUSED) +virSecurityDACRestoreGraphicsLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + virDomainGraphicsDefPtr gfx G_GNUC_UNUSED) { /* The only graphics labelling we do is dependent on mountNamespaces, @@ -1816,7 +1816,7 @@ virSecurityDACSetInputLabel(virSecurityManagerPtr mgr, static int virSecurityDACRestoreInputLabel(virSecurityManagerPtr mgr, - virDomainDefPtr def ATTRIBUTE_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, virDomainInputDefPtr input) { int ret = -1; @@ -1840,7 +1840,7 @@ virSecurityDACRestoreInputLabel(virSecurityManagerPtr mgr, static int virSecurityDACRestoreMemoryLabel(virSecurityManagerPtr mgr, - virDomainDefPtr def ATTRIBUTE_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, virDomainMemoryDefPtr mem) { int ret = -1; @@ -1862,8 +1862,8 @@ virSecurityDACRestoreMemoryLabel(virSecurityManagerPtr mgr, static int -virSecurityDACRestoreSEVLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED) +virSecurityDACRestoreSEVLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED) { /* we only label /dev/sev when running with namespaces, so we don't need to * restore anything */ @@ -1972,7 +1972,7 @@ virSecurityDACRestoreAllLabel(virSecurityManagerPtr mgr, static int virSecurityDACSetChardevCallback(virDomainDefPtr def, - virDomainChrDefPtr dev ATTRIBUTE_UNUSED, + virDomainChrDefPtr dev G_GNUC_UNUSED, void *opaque) { struct _virSecuritySELinuxChardevCallbackData *data = opaque; @@ -2052,7 +2052,7 @@ virSecurityDACSetSEVLabel(virSecurityManagerPtr mgr, static int virSecurityDACSetAllLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, - const char *stdin_path ATTRIBUTE_UNUSED, + const char *stdin_path G_GNUC_UNUSED, bool chardevStdioLogd) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); @@ -2181,7 +2181,7 @@ virSecurityDACSetSavedStateLabel(virSecurityManagerPtr mgr, static int virSecurityDACRestoreSavedStateLabel(virSecurityManagerPtr mgr, - virDomainDefPtr def ATTRIBUTE_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, const char *savefile) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); @@ -2244,8 +2244,8 @@ virSecurityDACSetChildProcessLabel(virSecurityManagerPtr mgr, static int -virSecurityDACVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED) +virSecurityDACVerify(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED) { return 0; } @@ -2320,16 +2320,16 @@ virSecurityDACGenLabel(virSecurityManagerPtr mgr, } static int -virSecurityDACReleaseLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED) +virSecurityDACReleaseLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED) { return 0; } static int -virSecurityDACReserveLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - pid_t pid ATTRIBUTE_UNUSED) +virSecurityDACReserveLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + pid_t pid G_GNUC_UNUSED) { return 0; } @@ -2391,8 +2391,8 @@ virSecurityDACGetProcessLabelInternal(pid_t pid, } #else static int -virSecurityDACGetProcessLabelInternal(pid_t pid ATTRIBUTE_UNUSED, - virSecurityLabelPtr seclabel ATTRIBUTE_UNUSED) +virSecurityDACGetProcessLabelInternal(pid_t pid G_GNUC_UNUSED, + virSecurityLabelPtr seclabel G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot get process uid and gid on this platform")); @@ -2401,7 +2401,7 @@ virSecurityDACGetProcessLabelInternal(pid_t pid ATTRIBUTE_UNUSED, #endif static int -virSecurityDACGetProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +virSecurityDACGetProcessLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def, pid_t pid, virSecurityLabelPtr seclabel) @@ -2426,54 +2426,54 @@ virSecurityDACGetProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, } static int -virSecurityDACSetDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +virSecurityDACSetDaemonSocketLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED) { return 0; } static int -virSecurityDACSetSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED) +virSecurityDACSetSocketLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED) { return 0; } static int -virSecurityDACClearSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED) +virSecurityDACClearSocketLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED) { return 0; } static int -virSecurityDACSetImageFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED) +virSecurityDACSetImageFDLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + int fd G_GNUC_UNUSED) { return 0; } static int -virSecurityDACSetTapFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED) +virSecurityDACSetTapFDLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + int fd G_GNUC_UNUSED) { return 0; } static char * -virSecurityDACGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +virSecurityDACGetMountOptions(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED) { return NULL; } static const char * virSecurityDACGetBaseLabel(virSecurityManagerPtr mgr, - int virt ATTRIBUTE_UNUSED) + int virt G_GNUC_UNUSED) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); return priv->baselabel; @@ -2483,7 +2483,7 @@ static int virSecurityDACDomainSetPathLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, const char *path, - bool allowSubtree ATTRIBUTE_UNUSED) + bool allowSubtree G_GNUC_UNUSED) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityLabelDefPtr seclabel; diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 7f187c9068..b5ccfad523 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -816,7 +816,7 @@ virSecurityManagerCheckChardevLabel(virSecurityManagerPtr mgr, static int -virSecurityManagerCheckChardevCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, +virSecurityManagerCheckChardevCallback(virDomainDefPtr def G_GNUC_UNUSED, virDomainChrDefPtr dev, void *opaque) { @@ -1277,7 +1277,7 @@ cmpstringp(const void *p1, const void *p2) * NULL on failure. */ virSecurityManagerMetadataLockStatePtr -virSecurityManagerMetadataLock(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +virSecurityManagerMetadataLock(virSecurityManagerPtr mgr G_GNUC_UNUSED, const char **paths, size_t npaths) { @@ -1382,7 +1382,7 @@ virSecurityManagerMetadataLock(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, void -virSecurityManagerMetadataUnlock(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +virSecurityManagerMetadataUnlock(virSecurityManagerPtr mgr G_GNUC_UNUSED, virSecurityManagerMetadataLockStatePtr *state) { size_t i; diff --git a/src/security/security_nop.c b/src/security/security_nop.c index 966b9d41a1..604e65252b 100644 --- a/src/security/security_nop.c +++ b/src/security/security_nop.c @@ -26,172 +26,172 @@ #define VIR_FROM_THIS VIR_FROM_SECURITY static virSecurityDriverStatus -virSecurityDriverProbeNop(const char *virtDriver ATTRIBUTE_UNUSED) +virSecurityDriverProbeNop(const char *virtDriver G_GNUC_UNUSED) { return SECURITY_DRIVER_ENABLE; } static int -virSecurityDriverOpenNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityDriverOpenNop(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return 0; } static int -virSecurityDriverCloseNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityDriverCloseNop(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return 0; } static const char * -virSecurityDriverGetModelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityDriverGetModelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return "none"; } static const char * -virSecurityDriverGetDOINop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityDriverGetDOINop(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return "0"; } static int -virSecurityDomainSetDaemonSocketLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +virSecurityDomainSetDaemonSocketLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainSetSocketLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +virSecurityDomainSetSocketLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainClearSocketLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +virSecurityDomainClearSocketLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainRestoreHostdevLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED, - virDomainHostdevDefPtr dev ATTRIBUTE_UNUSED, - const char *vroot ATTRIBUTE_UNUSED) +virSecurityDomainRestoreHostdevLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED, + virDomainHostdevDefPtr dev G_GNUC_UNUSED, + const char *vroot G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainSetHostdevLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED, - virDomainHostdevDefPtr dev ATTRIBUTE_UNUSED, - const char *vroot ATTRIBUTE_UNUSED) +virSecurityDomainSetHostdevLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED, + virDomainHostdevDefPtr dev G_GNUC_UNUSED, + const char *vroot G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainSetSavedStateLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED, - const char *savefile ATTRIBUTE_UNUSED) +virSecurityDomainSetSavedStateLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED, + const char *savefile G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainRestoreSavedStateLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED, - const char *savefile ATTRIBUTE_UNUSED) +virSecurityDomainRestoreSavedStateLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED, + const char *savefile G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainGenLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr sec ATTRIBUTE_UNUSED) +virSecurityDomainGenLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr sec G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainReserveLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr sec ATTRIBUTE_UNUSED, - pid_t pid ATTRIBUTE_UNUSED) +virSecurityDomainReserveLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr sec G_GNUC_UNUSED, + pid_t pid G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainReleaseLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr sec ATTRIBUTE_UNUSED) +virSecurityDomainReleaseLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr sec G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainSetAllLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr sec ATTRIBUTE_UNUSED, - const char *stdin_path ATTRIBUTE_UNUSED, - bool chardevStdioLogd ATTRIBUTE_UNUSED) +virSecurityDomainSetAllLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr sec G_GNUC_UNUSED, + const char *stdin_path G_GNUC_UNUSED, + bool chardevStdioLogd G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainRestoreAllLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED, - bool migrated ATTRIBUTE_UNUSED, - bool chardevStdioLogd ATTRIBUTE_UNUSED) +virSecurityDomainRestoreAllLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED, + bool migrated G_GNUC_UNUSED, + bool chardevStdioLogd G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainGetProcessLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED, - pid_t pid ATTRIBUTE_UNUSED, - virSecurityLabelPtr sec ATTRIBUTE_UNUSED) +virSecurityDomainGetProcessLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED, + pid_t pid G_GNUC_UNUSED, + virSecurityLabelPtr sec G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainSetProcessLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +virSecurityDomainSetProcessLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainSetChildProcessLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED, - virCommandPtr cmd ATTRIBUTE_UNUSED) +virSecurityDomainSetChildProcessLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED, + virCommandPtr cmd G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainVerifyNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED) +virSecurityDomainVerifyNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainSetFDLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr sec ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED) +virSecurityDomainSetFDLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr sec G_GNUC_UNUSED, + int fd G_GNUC_UNUSED) { return 0; } static char * -virSecurityDomainGetMountOptionsNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +virSecurityDomainGetMountOptionsNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED) { char *opts; @@ -200,77 +200,77 @@ virSecurityDomainGetMountOptionsNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, } static const char * -virSecurityGetBaseLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - int virtType ATTRIBUTE_UNUSED) +virSecurityGetBaseLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + int virtType G_GNUC_UNUSED) { return NULL; } static int -virSecurityDomainRestoreImageLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - virStorageSourcePtr src ATTRIBUTE_UNUSED, - virSecurityDomainImageLabelFlags flags ATTRIBUTE_UNUSED) +virSecurityDomainRestoreImageLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + virStorageSourcePtr src G_GNUC_UNUSED, + virSecurityDomainImageLabelFlags flags G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainSetImageLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - virStorageSourcePtr src ATTRIBUTE_UNUSED, - virSecurityDomainImageLabelFlags flags ATTRIBUTE_UNUSED) +virSecurityDomainSetImageLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + virStorageSourcePtr src G_GNUC_UNUSED, + virSecurityDomainImageLabelFlags flags G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainMoveImageMetadataNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - pid_t pid ATTRIBUTE_UNUSED, - virStorageSourcePtr src ATTRIBUTE_UNUSED, - virStorageSourcePtr dst ATTRIBUTE_UNUSED) +virSecurityDomainMoveImageMetadataNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + pid_t pid G_GNUC_UNUSED, + virStorageSourcePtr src G_GNUC_UNUSED, + virStorageSourcePtr dst G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainSetMemoryLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainMemoryDefPtr mem ATTRIBUTE_UNUSED) +virSecurityDomainSetMemoryLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + virDomainMemoryDefPtr mem G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainRestoreMemoryLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainMemoryDefPtr mem ATTRIBUTE_UNUSED) +virSecurityDomainRestoreMemoryLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + virDomainMemoryDefPtr mem G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainInputLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainInputDefPtr input ATTRIBUTE_UNUSED) +virSecurityDomainInputLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + virDomainInputDefPtr input G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainSetChardevLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainChrSourceDefPtr dev_source ATTRIBUTE_UNUSED, - bool chardevStdioLogd ATTRIBUTE_UNUSED) +virSecurityDomainSetChardevLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + virDomainChrSourceDefPtr dev_source G_GNUC_UNUSED, + bool chardevStdioLogd G_GNUC_UNUSED) { return 0; } static int -virSecurityDomainRestoreChardevLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainChrSourceDefPtr dev_source ATTRIBUTE_UNUSED, - bool chardevStdioLogd ATTRIBUTE_UNUSED) +virSecurityDomainRestoreChardevLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + virDomainChrSourceDefPtr dev_source G_GNUC_UNUSED, + bool chardevStdioLogd G_GNUC_UNUSED) { return 0; } diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 6e6b758497..7c2f1bb51a 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -250,7 +250,7 @@ static int virSecuritySELinuxRestoreFileLabel(virSecurityManagerPtr mgr, * -1 otherwise. */ static int -virSecuritySELinuxTransactionRun(pid_t pid ATTRIBUTE_UNUSED, +virSecuritySELinuxTransactionRun(pid_t pid G_GNUC_UNUSED, void *opaque) { virSecuritySELinuxContextListPtr list = opaque; @@ -702,7 +702,7 @@ virSecuritySELinuxLXCInitialize(virSecurityManagerPtr mgr) } #else static int -virSecuritySELinuxLXCInitialize(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecuritySELinuxLXCInitialize(virSecurityManagerPtr mgr G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("libselinux does not support LXC contexts path")); @@ -1070,13 +1070,13 @@ virSecuritySELinuxDriverClose(virSecurityManagerPtr mgr) static const char * -virSecuritySELinuxGetModel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecuritySELinuxGetModel(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return SECURITY_SELINUX_NAME; } static const char * -virSecuritySELinuxGetDOI(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecuritySELinuxGetDOI(virSecurityManagerPtr mgr G_GNUC_UNUSED) { /* * Where will the DOI come from? SELinux configuration, or qemu @@ -1149,7 +1149,7 @@ virSecuritySELinuxTransactionStart(virSecurityManagerPtr mgr) * -1 otherwise. */ static int -virSecuritySELinuxTransactionCommit(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +virSecuritySELinuxTransactionCommit(virSecurityManagerPtr mgr G_GNUC_UNUSED, pid_t pid, bool lock) { @@ -1199,7 +1199,7 @@ virSecuritySELinuxTransactionCommit(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, * Cancels and frees any out standing transaction. */ static void -virSecuritySELinuxTransactionAbort(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecuritySELinuxTransactionAbort(virSecurityManagerPtr mgr G_GNUC_UNUSED) { virSecuritySELinuxContextListPtr list; @@ -1213,8 +1213,8 @@ virSecuritySELinuxTransactionAbort(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) } static int -virSecuritySELinuxGetProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, +virSecuritySELinuxGetProcessLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, pid_t pid, virSecurityLabelPtr sec) { @@ -1462,7 +1462,7 @@ virSecuritySELinuxFSetFilecon(int fd, char *tcon) /* Set fcon to the appropriate label for path and mode, or return -1. */ static int -getContext(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +getContext(virSecurityManagerPtr mgr G_GNUC_UNUSED, const char *newpath, mode_t mode, security_context_t *fcon) { #if HAVE_SELINUX_LABEL_H @@ -1828,7 +1828,7 @@ static int virSecuritySELinuxRestoreImageLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, virStorageSourcePtr src, - virSecurityDomainImageLabelFlags flags ATTRIBUTE_UNUSED) + virSecurityDomainImageLabelFlags flags G_GNUC_UNUSED) { return virSecuritySELinuxRestoreImageLabelInt(mgr, def, src, false); } @@ -1966,7 +1966,7 @@ struct virSecuritySELinuxMoveImageMetadataData { static int -virSecuritySELinuxMoveImageMetadataHelper(pid_t pid ATTRIBUTE_UNUSED, +virSecuritySELinuxMoveImageMetadataHelper(pid_t pid G_GNUC_UNUSED, void *opaque) { struct virSecuritySELinuxMoveImageMetadataData *data = opaque; @@ -2029,14 +2029,14 @@ virSecuritySELinuxSetHostdevLabelHelper(const char *file, void *opaque) } static int -virSecuritySELinuxSetPCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED, +virSecuritySELinuxSetPCILabel(virPCIDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { return virSecuritySELinuxSetHostdevLabelHelper(file, opaque); } static int -virSecuritySELinuxSetUSBLabel(virUSBDevicePtr dev ATTRIBUTE_UNUSED, +virSecuritySELinuxSetUSBLabel(virUSBDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { return virSecuritySELinuxSetHostdevLabelHelper(file, opaque); @@ -2067,7 +2067,7 @@ virSecuritySELinuxSetSCSILabel(virSCSIDevicePtr dev, } static int -virSecuritySELinuxSetHostLabel(virSCSIVHostDevicePtr dev ATTRIBUTE_UNUSED, +virSecuritySELinuxSetHostLabel(virSCSIVHostDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { return virSecuritySELinuxSetHostdevLabelHelper(file, opaque); @@ -2272,7 +2272,7 @@ virSecuritySELinuxSetHostdevLabel(virSecurityManagerPtr mgr, } static int -virSecuritySELinuxRestorePCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED, +virSecuritySELinuxRestorePCILabel(virPCIDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -2282,7 +2282,7 @@ virSecuritySELinuxRestorePCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED, } static int -virSecuritySELinuxRestoreUSBLabel(virUSBDevicePtr dev ATTRIBUTE_UNUSED, +virSecuritySELinuxRestoreUSBLabel(virUSBDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -2309,7 +2309,7 @@ virSecuritySELinuxRestoreSCSILabel(virSCSIDevicePtr dev, } static int -virSecuritySELinuxRestoreHostLabel(virSCSIVHostDevicePtr dev ATTRIBUTE_UNUSED, +virSecuritySELinuxRestoreHostLabel(virSCSIVHostDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -2672,7 +2672,7 @@ struct _virSecuritySELinuxChardevCallbackData { static int virSecuritySELinuxRestoreSecurityChardevCallback(virDomainDefPtr def, - virDomainChrDefPtr dev ATTRIBUTE_UNUSED, + virDomainChrDefPtr dev G_GNUC_UNUSED, void *opaque) { struct _virSecuritySELinuxChardevCallbackData *data = opaque; @@ -2874,7 +2874,7 @@ virSecuritySELinuxRestoreSavedStateLabel(virSecurityManagerPtr mgr, static int -virSecuritySELinuxVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +virSecuritySELinuxVerify(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def) { virSecurityLabelDefPtr secdef; @@ -2903,7 +2903,7 @@ virSecuritySELinuxVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, } static int -virSecuritySELinuxSetProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +virSecuritySELinuxSetProcessLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def) { /* TODO: verify DOI */ @@ -2936,7 +2936,7 @@ virSecuritySELinuxSetProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, } static int -virSecuritySELinuxSetChildProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +virSecuritySELinuxSetChildProcessLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def, virCommandPtr cmd) { @@ -2964,7 +2964,7 @@ virSecuritySELinuxSetChildProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSE } static int -virSecuritySELinuxSetDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +virSecuritySELinuxSetDaemonSocketLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def) { /* TODO: verify DOI */ @@ -3014,7 +3014,7 @@ virSecuritySELinuxSetDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSE } static int -virSecuritySELinuxSetSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +virSecuritySELinuxSetSocketLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr vm) { virSecurityLabelDefPtr secdef; @@ -3052,7 +3052,7 @@ virSecuritySELinuxSetSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, } static int -virSecuritySELinuxClearSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +virSecuritySELinuxClearSocketLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def) { /* TODO: verify DOI */ @@ -3085,7 +3085,7 @@ virSecuritySELinuxClearSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, static int virSecuritySELinuxSetSecurityChardevCallback(virDomainDefPtr def, - virDomainChrDefPtr dev ATTRIBUTE_UNUSED, + virDomainChrDefPtr dev G_GNUC_UNUSED, void *opaque) { struct _virSecuritySELinuxChardevCallbackData *data = opaque; @@ -3235,7 +3235,7 @@ virSecuritySELinuxSetAllLabel(virSecurityManagerPtr mgr, } static int -virSecuritySELinuxSetImageFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +virSecuritySELinuxSetImageFDLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def, int fd) { @@ -3379,7 +3379,7 @@ static int virSecuritySELinuxDomainSetPathLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, const char *path, - bool allowSubtree ATTRIBUTE_UNUSED) + bool allowSubtree G_GNUC_UNUSED) { virSecurityLabelDefPtr seclabel; diff --git a/src/security/security_stack.c b/src/security/security_stack.c index d445c0773e..b5a0c6c4d2 100644 --- a/src/security/security_stack.c +++ b/src/security/security_stack.c @@ -72,13 +72,13 @@ virSecurityStackGetPrimary(virSecurityManagerPtr mgr) } static virSecurityDriverStatus -virSecurityStackProbe(const char *virtDriver ATTRIBUTE_UNUSED) +virSecurityStackProbe(const char *virtDriver G_GNUC_UNUSED) { return SECURITY_DRIVER_ENABLE; } static int -virSecurityStackOpen(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityStackOpen(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return 0; } @@ -526,8 +526,8 @@ virSecurityStackSetTapFDLabel(virSecurityManagerPtr mgr, } static char * -virSecurityStackGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +virSecurityStackGetMountOptions(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED) { return NULL; } diff --git a/src/security/security_util.c b/src/security/security_util.c index 865b3ec905..4fd8289413 100644 --- a/src/security/security_util.c +++ b/src/security/security_util.c @@ -59,7 +59,7 @@ VIR_LOG_INIT("security.security_util"); #endif static char * -virSecurityGetAttrName(const char *name ATTRIBUTE_UNUSED) +virSecurityGetAttrName(const char *name G_GNUC_UNUSED) { char *ret = NULL; #ifdef XATTR_NAMESPACE @@ -74,7 +74,7 @@ virSecurityGetAttrName(const char *name ATTRIBUTE_UNUSED) static char * -virSecurityGetRefCountAttrName(const char *name ATTRIBUTE_UNUSED) +virSecurityGetRefCountAttrName(const char *name G_GNUC_UNUSED) { char *ret = NULL; #ifdef XATTR_NAMESPACE @@ -98,7 +98,7 @@ virSecurityGetTimestampAttrName(const char *name) } #else /* !XATTR_NAMESPACE */ static char * -virSecurityGetTimestampAttrName(const char *name ATTRIBUTE_UNUSED) +virSecurityGetTimestampAttrName(const char *name G_GNUC_UNUSED) { errno = ENOSYS; virReportSystemError(errno, "%s", diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 509187ac36..6a1aa96078 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -896,7 +896,7 @@ vah_add_file_chardev(virBufferPtr buf, } static int -file_iterate_hostdev_cb(virUSBDevicePtr dev ATTRIBUTE_UNUSED, +file_iterate_hostdev_cb(virUSBDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { virBufferPtr buf = opaque; @@ -904,7 +904,7 @@ file_iterate_hostdev_cb(virUSBDevicePtr dev ATTRIBUTE_UNUSED, } static int -file_iterate_pci_cb(virPCIDevicePtr dev ATTRIBUTE_UNUSED, +file_iterate_pci_cb(virPCIDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { virBufferPtr buf = opaque; -- 2.19.2

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/storage/storage_backend.c | 2 +- src/storage/storage_backend_disk.c | 6 ++--- src/storage/storage_backend_fs.c | 4 +-- src/storage/storage_backend_logical.c | 4 +-- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_rbd.c | 22 ++++++++-------- src/storage/storage_backend_zfs.c | 4 +-- src/storage/storage_driver.c | 22 ++++++++-------- src/storage/storage_util.c | 36 +++++++++++++-------------- 9 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index ed5bdd5bad..6ab5844235 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -106,7 +106,7 @@ virStorageDriverLoadBackendModule(const char *name, return -1 int -virStorageBackendDriversRegister(bool allbackends ATTRIBUTE_UNUSED) +virStorageBackendDriversRegister(bool allbackends G_GNUC_UNUSED) { #if WITH_STORAGE_DIR || WITH_STORAGE_FS VIR_STORAGE_BACKEND_REGISTER(virStorageBackendFsRegister, "fs"); diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index f58b7b294c..5bf704bcc8 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -41,7 +41,7 @@ VIR_LOG_INIT("storage.storage_backend_disk"); static bool virStorageVolPartFindExtended(virStorageVolDefPtr def, - const void *opaque ATTRIBUTE_UNUSED) + const void *opaque G_GNUC_UNUSED) { if (def->source.partType == VIR_STORAGE_VOL_DISK_TYPE_EXTENDED) return true; @@ -286,7 +286,7 @@ struct virStorageBackendDiskPoolVolData { }; static int -virStorageBackendDiskMakeVol(size_t ntok ATTRIBUTE_UNUSED, +virStorageBackendDiskMakeVol(size_t ntok G_GNUC_UNUSED, char **const groups, void *opaque) { @@ -391,7 +391,7 @@ virStorageBackendDiskReadPartitions(virStoragePoolObjPtr pool, } static int -virStorageBackendDiskMakePoolGeometry(size_t ntok ATTRIBUTE_UNUSED, +virStorageBackendDiskMakePoolGeometry(size_t ntok G_GNUC_UNUSED, char **const groups, void *data) { diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index c903677950..ed677058ed 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -438,8 +438,8 @@ virStorageBackendExecuteMKFS(const char *device, } #else /* #ifdef MKFS */ static int -virStorageBackendExecuteMKFS(const char *device ATTRIBUTE_UNUSED, - const char *format ATTRIBUTE_UNUSED) +virStorageBackendExecuteMKFS(const char *device G_GNUC_UNUSED, + const char *format G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, _("mkfs is not supported on this platform: " diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 603a3f9a42..6e468b3579 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -543,7 +543,7 @@ virStorageBackendLogicalGetPoolSources(virStoragePoolSourceListPtr sourceList) static char * -virStorageBackendLogicalFindPoolSources(const char *srcSpec ATTRIBUTE_UNUSED, +virStorageBackendLogicalFindPoolSources(const char *srcSpec G_GNUC_UNUSED, unsigned int flags) { virStoragePoolSourceList sourceList; @@ -837,7 +837,7 @@ virStorageBackendLogicalDeletePool(virStoragePoolObjPtr pool, static int -virStorageBackendLogicalDeleteVol(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendLogicalDeleteVol(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStorageVolDefPtr vol, unsigned int flags) { diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index cb1b23288a..4d41ea1107 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -233,7 +233,7 @@ virStorageBackendGetMaps(virStoragePoolObjPtr pool) } static int -virStorageBackendMpathCheckPool(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendMpathCheckPool(virStoragePoolObjPtr pool G_GNUC_UNUSED, bool *isActive) { *isActive = virFileExists("/dev/mapper") || diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index b10ca1503d..4f4ade9d15 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -450,7 +450,7 @@ volStorageBackendRBDUseFastDiff(uint64_t features, uint64_t flags) } static int -virStorageBackendRBDRefreshVolInfoCb(uint64_t offset ATTRIBUTE_UNUSED, +virStorageBackendRBDRefreshVolInfoCb(uint64_t offset G_GNUC_UNUSED, size_t len, int exists, void *arg) @@ -490,8 +490,8 @@ virStorageBackendRBDSetAllocation(virStorageVolDefPtr vol, #else static int -volStorageBackendRBDGetFlags(rbd_image_t image ATTRIBUTE_UNUSED, - const char *volname ATTRIBUTE_UNUSED, +volStorageBackendRBDGetFlags(rbd_image_t image G_GNUC_UNUSED, + const char *volname G_GNUC_UNUSED, uint64_t *flags) { *flags = 0; @@ -499,16 +499,16 @@ volStorageBackendRBDGetFlags(rbd_image_t image ATTRIBUTE_UNUSED, } static int -volStorageBackendRBDUseFastDiff(uint64_t features ATTRIBUTE_UNUSED, - uint64_t feature_flags ATTRIBUTE_UNUSED) +volStorageBackendRBDUseFastDiff(uint64_t features G_GNUC_UNUSED, + uint64_t feature_flags G_GNUC_UNUSED) { return false; } static int -virStorageBackendRBDSetAllocation(virStorageVolDefPtr vol ATTRIBUTE_UNUSED, - rbd_image_t *image ATTRIBUTE_UNUSED, - rbd_image_info_t *info ATTRIBUTE_UNUSED) +virStorageBackendRBDSetAllocation(virStorageVolDefPtr vol G_GNUC_UNUSED, + rbd_image_t *image G_GNUC_UNUSED, + rbd_image_info_t *info G_GNUC_UNUSED) { return false; } @@ -1013,9 +1013,9 @@ virStorageBackendRBDImageInfo(rbd_image_t image, /* Callback function for rbd_diff_iterate() */ static int -virStorageBackendRBDIterateCb(uint64_t offset ATTRIBUTE_UNUSED, - size_t length ATTRIBUTE_UNUSED, - int exists ATTRIBUTE_UNUSED, +virStorageBackendRBDIterateCb(uint64_t offset G_GNUC_UNUSED, + size_t length G_GNUC_UNUSED, + int exists G_GNUC_UNUSED, void *arg) { /* diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c index d172a5a165..354d65d8c3 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -81,7 +81,7 @@ virStorageBackendZFSVolModeNeeded(void) } static int -virStorageBackendZFSCheckPool(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendZFSCheckPool(virStoragePoolObjPtr pool G_GNUC_UNUSED, bool *isActive) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); @@ -218,7 +218,7 @@ virStorageBackendZFSFindVols(virStoragePoolObjPtr pool, } static int -virStorageBackendZFSRefreshPool(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED) +virStorageBackendZFSRefreshPool(virStoragePoolObjPtr pool G_GNUC_UNUSED) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); char *zpool_props = NULL; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index c536535c6c..6516b0943d 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -132,7 +132,7 @@ virStoragePoolUpdateInactive(virStoragePoolObjPtr obj) static void storagePoolUpdateStateCallback(virStoragePoolObjPtr obj, - const void *opaque ATTRIBUTE_UNUSED) + const void *opaque G_GNUC_UNUSED) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(obj); bool active = false; @@ -191,7 +191,7 @@ storagePoolUpdateAllState(void) static void storageDriverAutostartCallback(virStoragePoolObjPtr obj, - const void *opaque ATTRIBUTE_UNUSED) + const void *opaque G_GNUC_UNUSED) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(obj); virStorageBackendPtr backend; @@ -253,8 +253,8 @@ storageDriverAutostart(void) */ static int storageStateInitialize(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + virStateInhibitCallback callback G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { VIR_AUTOFREE(char *) configdir = NULL; VIR_AUTOFREE(char *) rundir = NULL; @@ -404,8 +404,8 @@ storageStateCleanup(void) static virDrvOpenStatus storageConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -427,27 +427,27 @@ storageConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int storageConnectClose(virConnectPtr conn ATTRIBUTE_UNUSED) +static int storageConnectClose(virConnectPtr conn G_GNUC_UNUSED) { return 0; } -static int storageConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int storageConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* Trivially secure, since always inside the daemon */ return 1; } -static int storageConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int storageConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* Not encrypted, but remote driver takes care of that */ return 0; } -static int storageConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int storageConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } @@ -2377,7 +2377,7 @@ virStorageVolPoolRefreshThread(void *opaque) * @opaque Buffer to hold the pool name to be refreshed */ static void -virStorageVolFDStreamCloseCb(virStreamPtr st ATTRIBUTE_UNUSED, +virStorageVolFDStreamCloseCb(virStreamPtr st G_GNUC_UNUSED, void *opaque) { virThread thread; diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index be084119f4..83e93253e4 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -113,8 +113,8 @@ reflinkCloneFile(int dest_fd, int src_fd) } #else static inline int -reflinkCloneFile(int dest_fd ATTRIBUTE_UNUSED, - int src_fd ATTRIBUTE_UNUSED) +reflinkCloneFile(int dest_fd G_GNUC_UNUSED, + int src_fd G_GNUC_UNUSED) { errno = ENOTSUP; return -1; @@ -236,7 +236,7 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, } static int -storageBackendCreateBlockFrom(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +storageBackendCreateBlockFrom(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol, unsigned int flags) @@ -591,7 +591,7 @@ virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool, /* Create ploop directory with ploop image and DiskDescriptor.xml * if function fails to create image file the directory will be deleted.*/ static int -storageBackendCreatePloop(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +storageBackendCreatePloop(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol, unsigned int flags) @@ -2136,7 +2136,7 @@ virStorageBackendVolBuildFromLocal(virStoragePoolObjPtr pool, * Remove a volume - no support for BLOCK and NETWORK yet */ int -virStorageBackendVolDeleteLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendVolDeleteLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStorageVolDefPtr vol, unsigned int flags) { @@ -2237,7 +2237,7 @@ storageBackendLoadDefaultSecrets(virStorageVolDefPtr vol) * Update info about a volume's capacity/allocation */ int -virStorageBackendVolRefreshLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendVolRefreshLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStorageVolDefPtr vol) { int ret; @@ -2407,7 +2407,7 @@ storageBackendPloopHasSnapshots(char *path) int -virStorageBackendVolUploadLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendVolUploadLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStorageVolDefPtr vol, virStreamPtr stream, unsigned long long offset, @@ -2448,7 +2448,7 @@ virStorageBackendVolUploadLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, } int -virStorageBackendVolDownloadLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendVolDownloadLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStorageVolDefPtr vol, virStreamPtr stream, unsigned long long offset, @@ -2716,7 +2716,7 @@ storageBackendVolWipePloop(virStorageVolDefPtr vol, int -virStorageBackendVolWipeLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendVolWipeLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStorageVolDefPtr vol, unsigned int algorithm, unsigned int flags) @@ -3145,9 +3145,9 @@ virStorageBackendBLKIDFindEmpty(const char *device, #else /* #if WITH_BLKID */ static int -virStorageBackendBLKIDFindEmpty(const char *device ATTRIBUTE_UNUSED, - const char *format ATTRIBUTE_UNUSED, - bool writelabel ATTRIBUTE_UNUSED) +virStorageBackendBLKIDFindEmpty(const char *device G_GNUC_UNUSED, + const char *format G_GNUC_UNUSED, + bool writelabel G_GNUC_UNUSED) { return -2; } @@ -3303,9 +3303,9 @@ virStorageBackendPARTEDValidLabel(const char *device, #else static int -virStorageBackendPARTEDValidLabel(const char *device ATTRIBUTE_UNUSED, - const char *format ATTRIBUTE_UNUSED, - bool writelabel ATTRIBUTE_UNUSED) +virStorageBackendPARTEDValidLabel(const char *device G_GNUC_UNUSED, + const char *format G_GNUC_UNUSED, + bool writelabel G_GNUC_UNUSED) { return -2; } @@ -3658,7 +3658,7 @@ virStorageBackendSCSISerial(const char *dev, */ static int virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, - uint32_t host ATTRIBUTE_UNUSED, + uint32_t host G_GNUC_UNUSED, uint32_t bus, uint32_t target, uint32_t lun, @@ -3750,7 +3750,7 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, static int getNewStyleBlockDevice(const char *lun_path, - const char *block_name ATTRIBUTE_UNUSED, + const char *block_name G_GNUC_UNUSED, char **block_device) { DIR *block_dir = NULL; @@ -3788,7 +3788,7 @@ getNewStyleBlockDevice(const char *lun_path, static int -getOldStyleBlockDevice(const char *lun_path ATTRIBUTE_UNUSED, +getOldStyleBlockDevice(const char *lun_path G_GNUC_UNUSED, const char *block_name, char **block_device) { -- 2.19.2

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- tests/bhyvexml2argvmock.c | 36 ++++++++++---------- tests/commandtest.c | 58 ++++++++++++++++---------------- tests/esxutilstest.c | 8 ++--- tests/eventtest.c | 2 +- tests/fchosttest.c | 12 +++---- tests/networkxml2firewalltest.c | 8 ++--- tests/nsslinktest.c | 4 +-- tests/nwfilterebiptablestest.c | 14 ++++---- tests/objecteventtest.c | 30 ++++++++--------- tests/openvzutilstest.c | 8 ++--- tests/qemuagenttest.c | 6 ++-- tests/qemucapsprobe.c | 2 +- tests/qemucpumock.c | 4 +-- tests/qemufirmwaretest.c | 2 +- tests/qemumonitortestutils.c | 22 ++++++------ tests/qemusecuritymock.c | 18 +++++----- tests/qemuvhostusertest.c | 2 +- tests/qemuxml2argvmock.c | 46 ++++++++++++------------- tests/qemuxml2argvtest.c | 10 +++--- tests/scsihosttest.c | 4 +-- tests/securityselinuxtest.c | 2 +- tests/shunloadhelper.c | 4 +-- tests/shunloadtest.c | 2 +- tests/testutils.c | 24 ++++++------- tests/testutilsqemuschema.c | 6 ++-- tests/utiltest.c | 12 +++---- tests/viralloctest.c | 14 ++++---- tests/viratomictest.c | 4 +-- tests/virbitmaptest.c | 24 ++++++------- tests/virbuftest.c | 16 ++++----- tests/vircapstest.c | 10 +++--- tests/vircgrouptest.c | 32 +++++++++--------- tests/virconftest.c | 10 +++--- tests/virdbustest.c | 20 +++++------ tests/virdeterministichashmock.c | 2 +- tests/virendiantest.c | 4 +-- tests/virerrortest.c | 2 +- tests/virfilecachemock.c | 2 +- tests/virfilecachetest.c | 10 +++--- tests/virfiletest.c | 6 ++-- tests/virfirewalltest.c | 36 ++++++++++---------- tests/virhashtest.c | 30 ++++++++--------- tests/virhostdevtest.c | 10 +++--- tests/viridentitytest.c | 6 ++-- tests/viriscsitest.c | 6 ++-- tests/virjsontest.c | 4 +-- tests/virkeycodetest.c | 4 +-- tests/virkeyfiletest.c | 2 +- tests/virkmodtest.c | 2 +- tests/virlockspacetest.c | 14 ++++---- tests/virmock.h | 2 +- tests/virnetdaemontest.c | 8 ++--- tests/virnetmessagetest.c | 10 +++--- tests/virnetserverclientmock.c | 16 ++++----- tests/virnetserverclienttest.c | 6 ++-- tests/virnetsockettest.c | 8 ++--- tests/virnumamock.c | 2 +- tests/virpcimock.c | 2 +- tests/virpcitest.c | 8 ++--- tests/virpolkittest.c | 12 +++---- tests/virportallocatormock.c | 4 +-- tests/virportallocatortest.c | 4 +-- tests/virprocessmock.c | 2 +- tests/virrandommock.c | 2 +- tests/virrotatingfiletest.c | 26 +++++++------- tests/virscsitest.c | 4 +-- tests/virshtest.c | 32 +++++++++--------- tests/virstoragetest.c | 2 +- tests/virstringtest.c | 10 +++--- tests/virsystemdtest.c | 24 ++++++------- tests/virtestmock.c | 2 +- tests/virtypedparamtest.c | 6 ++-- tests/virusbtest.c | 4 +-- tests/vmx2xmltest.c | 2 +- tests/vshtabletest.c | 18 +++++----- tests/xml2vmxtest.c | 6 ++-- 76 files changed, 419 insertions(+), 419 deletions(-) diff --git a/tests/bhyvexml2argvmock.c b/tests/bhyvexml2argvmock.c index f4fac092a5..717ceb4847 100644 --- a/tests/bhyvexml2argvmock.c +++ b/tests/bhyvexml2argvmock.c @@ -19,19 +19,19 @@ void virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN], addr->addr[5] = 0; } -int virNetDevTapCreateInBridgePort(const char *brname ATTRIBUTE_UNUSED, +int virNetDevTapCreateInBridgePort(const char *brname G_GNUC_UNUSED, char **ifname, - const virMacAddr *macaddr ATTRIBUTE_UNUSED, - const unsigned char *vmuuid ATTRIBUTE_UNUSED, - const char *tunpath ATTRIBUTE_UNUSED, - int *tapfd ATTRIBUTE_UNUSED, - size_t tapfdSize ATTRIBUTE_UNUSED, - virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED, - virNetDevVlanPtr virtVlan ATTRIBUTE_UNUSED, - virNetDevCoalescePtr coalesce ATTRIBUTE_UNUSED, - unsigned int mtu ATTRIBUTE_UNUSED, - unsigned int *actualMTU ATTRIBUTE_UNUSED, - unsigned int fakeflags ATTRIBUTE_UNUSED) + const virMacAddr *macaddr G_GNUC_UNUSED, + const unsigned char *vmuuid G_GNUC_UNUSED, + const char *tunpath G_GNUC_UNUSED, + int *tapfd G_GNUC_UNUSED, + size_t tapfdSize G_GNUC_UNUSED, + virNetDevVPortProfilePtr virtPortProfile G_GNUC_UNUSED, + virNetDevVlanPtr virtVlan G_GNUC_UNUSED, + virNetDevCoalescePtr coalesce G_GNUC_UNUSED, + unsigned int mtu G_GNUC_UNUSED, + unsigned int *actualMTU G_GNUC_UNUSED, + unsigned int fakeflags G_GNUC_UNUSED) { VIR_FREE(*ifname); if (VIR_STRDUP(*ifname, "vnet0") < 0) @@ -39,7 +39,7 @@ int virNetDevTapCreateInBridgePort(const char *brname ATTRIBUTE_UNUSED, return 0; } -char *virNetDevTapGetRealDeviceName(char *name ATTRIBUTE_UNUSED) +char *virNetDevTapGetRealDeviceName(char *name G_GNUC_UNUSED) { char *fakename; @@ -48,15 +48,15 @@ char *virNetDevTapGetRealDeviceName(char *name ATTRIBUTE_UNUSED) return fakename; } -int virNetDevSetOnline(const char *ifname ATTRIBUTE_UNUSED, - bool online ATTRIBUTE_UNUSED) +int virNetDevSetOnline(const char *ifname G_GNUC_UNUSED, + bool online G_GNUC_UNUSED) { return 0; } -int bind(int sockfd ATTRIBUTE_UNUSED, - const struct sockaddr *addr ATTRIBUTE_UNUSED, - socklen_t addrlen ATTRIBUTE_UNUSED) +int bind(int sockfd G_GNUC_UNUSED, + const struct sockaddr *addr G_GNUC_UNUSED, + socklen_t addrlen G_GNUC_UNUSED) { return 0; } diff --git a/tests/commandtest.c b/tests/commandtest.c index 2ec3434f1e..e79baa2946 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -115,7 +115,7 @@ static int checkoutput(const char *testname, * Only stdin/out/err open * No slot for return status must log error. */ -static int test0(const void *unused ATTRIBUTE_UNUSED) +static int test0(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd; int ret = -1; @@ -140,7 +140,7 @@ static int test0(const void *unused ATTRIBUTE_UNUSED) * Only stdin/out/err open * Capturing return status must not log error. */ -static int test1(const void *unused ATTRIBUTE_UNUSED) +static int test1(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd; int ret = -1; @@ -168,7 +168,7 @@ static int test1(const void *unused ATTRIBUTE_UNUSED) * Run program (twice), no args, inherit all ENV, keep CWD. * Only stdin/out/err open */ -static int test2(const void *unused ATTRIBUTE_UNUSED) +static int test2(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); int ret; @@ -199,7 +199,7 @@ static int test2(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit all ENV, keep CWD. * stdin/out/err + two extra FD open */ -static int test3(const void *unused ATTRIBUTE_UNUSED) +static int test3(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); int newfd1 = dup(STDERR_FILENO); @@ -239,7 +239,7 @@ static int test3(const void *unused ATTRIBUTE_UNUSED) * Only stdin/out/err open. * Daemonized */ -static int test4(const void *unused ATTRIBUTE_UNUSED) +static int test4(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); char *pidfile = virPidFileBuildPath(abs_builddir, "commandhelper"); @@ -279,7 +279,7 @@ static int test4(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit filtered ENV, keep CWD. * Only stdin/out/err open */ -static int test5(const void *unused ATTRIBUTE_UNUSED) +static int test5(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); @@ -301,7 +301,7 @@ static int test5(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit filtered ENV, keep CWD. * Only stdin/out/err open */ -static int test6(const void *unused ATTRIBUTE_UNUSED) +static int test6(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); @@ -324,7 +324,7 @@ static int test6(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit filtered ENV, keep CWD. * Only stdin/out/err open */ -static int test7(const void *unused ATTRIBUTE_UNUSED) +static int test7(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); @@ -347,7 +347,7 @@ static int test7(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit filtered ENV, keep CWD. * Only stdin/out/err open */ -static int test8(const void *unused ATTRIBUTE_UNUSED) +static int test8(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); @@ -372,7 +372,7 @@ static int test8(const void *unused ATTRIBUTE_UNUSED) * Run program, some args, inherit all ENV, keep CWD. * Only stdin/out/err open */ -static int test9(const void *unused ATTRIBUTE_UNUSED) +static int test9(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); const char* const args[] = { "arg1", "arg2", NULL }; @@ -409,7 +409,7 @@ static int test9(const void *unused ATTRIBUTE_UNUSED) * Run program, some args, inherit all ENV, keep CWD. * Only stdin/out/err open */ -static int test10(const void *unused ATTRIBUTE_UNUSED) +static int test10(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); const char *const args[] = { @@ -433,7 +433,7 @@ static int test10(const void *unused ATTRIBUTE_UNUSED) * Run program, some args, inherit all ENV, keep CWD. * Only stdin/out/err open */ -static int test11(const void *unused ATTRIBUTE_UNUSED) +static int test11(const void *unused G_GNUC_UNUSED) { const char *args[] = { abs_builddir "/commandhelper", @@ -456,7 +456,7 @@ static int test11(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit all ENV, keep CWD. * Only stdin/out/err open. Set stdin data */ -static int test12(const void *unused ATTRIBUTE_UNUSED) +static int test12(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); @@ -477,7 +477,7 @@ static int test12(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit all ENV, keep CWD. * Only stdin/out/err open. Set stdin data */ -static int test13(const void *unused ATTRIBUTE_UNUSED) +static int test13(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); char *outactual = NULL; @@ -516,7 +516,7 @@ static int test13(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit all ENV, keep CWD. * Only stdin/out/err open. Set stdin data */ -static int test14(const void *unused ATTRIBUTE_UNUSED) +static int test14(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); char *outactual = NULL; @@ -589,7 +589,7 @@ static int test14(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit all ENV, change CWD. * Only stdin/out/err open */ -static int test15(const void *unused ATTRIBUTE_UNUSED) +static int test15(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); char *cwd = NULL; @@ -617,7 +617,7 @@ static int test15(const void *unused ATTRIBUTE_UNUSED) /* * Don't run program; rather, log what would be run. */ -static int test16(const void *unused ATTRIBUTE_UNUSED) +static int test16(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNew("true"); char *outactual = NULL; @@ -662,7 +662,7 @@ static int test16(const void *unused ATTRIBUTE_UNUSED) /* * Test string handling when no output is present. */ -static int test17(const void *unused ATTRIBUTE_UNUSED) +static int test17(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNew("true"); int ret = -1; @@ -718,7 +718,7 @@ static int test17(const void *unused ATTRIBUTE_UNUSED) /* * Run long-running daemon, to ensure no hang. */ -static int test18(const void *unused ATTRIBUTE_UNUSED) +static int test18(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNewArgList("sleep", "100", NULL); char *pidfile = virPidFileBuildPath(abs_builddir, "commandhelper"); @@ -766,7 +766,7 @@ static int test18(const void *unused ATTRIBUTE_UNUSED) /* * Asynchronously run long-running daemon, to ensure no hang. */ -static int test19(const void *unused ATTRIBUTE_UNUSED) +static int test19(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNewArgList("sleep", "100", NULL); pid_t pid; @@ -803,7 +803,7 @@ static int test19(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit all ENV, keep CWD. * Ignore huge stdin data, to provoke SIGPIPE or EPIPE in parent. */ -static int test20(const void *unused ATTRIBUTE_UNUSED) +static int test20(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNewArgList(abs_builddir "/commandhelper", "--close-stdin", NULL); @@ -846,7 +846,7 @@ static const char *const newenv[] = { NULL }; -static int test21(const void *unused ATTRIBUTE_UNUSED) +static int test21(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); int ret = -1; @@ -894,7 +894,7 @@ static int test21(const void *unused ATTRIBUTE_UNUSED) } static int -test22(const void *unused ATTRIBUTE_UNUSED) +test22(const void *unused G_GNUC_UNUSED) { int ret = -1; virCommandPtr cmd; @@ -947,7 +947,7 @@ test22(const void *unused ATTRIBUTE_UNUSED) static int -test23(const void *unused ATTRIBUTE_UNUSED) +test23(const void *unused G_GNUC_UNUSED) { /* Not strictly a virCommand test, but this is the easiest place * to test this lower-level interface. It takes a double fork to @@ -1003,7 +1003,7 @@ test23(const void *unused ATTRIBUTE_UNUSED) return ret; } -static int test25(const void *unused ATTRIBUTE_UNUSED) +static int test25(const void *unused G_GNUC_UNUSED) { int ret = -1; int pipeFD[2] = { -1, -1}; @@ -1081,7 +1081,7 @@ static int test25(const void *unused ATTRIBUTE_UNUSED) /* * Don't run program; rather, log what would be run. */ -static int test26(const void *unused ATTRIBUTE_UNUSED) +static int test26(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNew("true"); char *outactual = NULL; @@ -1139,7 +1139,7 @@ static int test26(const void *unused ATTRIBUTE_UNUSED) return ret; } -static int test27(const void *unused ATTRIBUTE_UNUSED) +static int test27(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd = virCommandNew(abs_builddir "/commandhelper"); int pipe1[2]; @@ -1277,8 +1277,8 @@ static void virCommandThreadWorker(void *opaque) } static void -virCommandTestFreeTimer(int timer ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +virCommandTestFreeTimer(int timer G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { /* nothing to be done here */ } diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c index 872987a7d7..49a159a2be 100644 --- a/tests/esxutilstest.c +++ b/tests/esxutilstest.c @@ -33,7 +33,7 @@ static struct testPath paths[] = { }; static int -testParseDatastorePath(const void *data ATTRIBUTE_UNUSED) +testParseDatastorePath(const void *data G_GNUC_UNUSED) { int result = 0; size_t i; @@ -121,7 +121,7 @@ static struct testDateTime times[] = { }; static int -testConvertDateTimeToCalendarTime(const void *data ATTRIBUTE_UNUSED) +testConvertDateTimeToCalendarTime(const void *data G_GNUC_UNUSED) { size_t i; esxVI_DateTime dateTime; @@ -172,7 +172,7 @@ static struct testDatastoreItem datastoreItems[] = { }; static int -testEscapeDatastoreItem(const void *data ATTRIBUTE_UNUSED) +testEscapeDatastoreItem(const void *data G_GNUC_UNUSED) { size_t i; char *escaped = NULL; @@ -212,7 +212,7 @@ static struct testWindows1252ToUTF8 windows1252ToUTF8[] = { }; static int -testConvertWindows1252ToUTF8(const void *data ATTRIBUTE_UNUSED) +testConvertWindows1252ToUTF8(const void *data G_GNUC_UNUSED) { size_t i; char *utf8 = NULL; diff --git a/tests/eventtest.c b/tests/eventtest.c index 2a6edc7461..d64854ecc6 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -158,7 +158,7 @@ static pthread_cond_t eventThreadJobCond = PTHREAD_COND_INITIALIZER; static int eventThreadJobDone; -G_GNUC_NORETURN static void *eventThreadLoop(void *data ATTRIBUTE_UNUSED) { +G_GNUC_NORETURN static void *eventThreadLoop(void *data G_GNUC_UNUSED) { while (1) { pthread_mutex_lock(&eventThreadMutex); while (!eventThreadRunOnce) diff --git a/tests/fchosttest.c b/tests/fchosttest.c index 05272a2e9e..4e37656576 100644 --- a/tests/fchosttest.c +++ b/tests/fchosttest.c @@ -90,7 +90,7 @@ static const char test11_xml[] = /* Test virIsVHBACapable */ static int -test1(const void *data ATTRIBUTE_UNUSED) +test1(const void *data G_GNUC_UNUSED) { if (virVHBAPathExists(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM) && virVHBAPathExists(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM_NO_FAB)) @@ -101,7 +101,7 @@ test1(const void *data ATTRIBUTE_UNUSED) /* Test virVHBAIsVportCapable */ static int -test2(const void *data ATTRIBUTE_UNUSED) +test2(const void *data G_GNUC_UNUSED) { if (virVHBAIsVportCapable(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM)) return 0; @@ -111,7 +111,7 @@ test2(const void *data ATTRIBUTE_UNUSED) /* Test virVHBAGetConfig */ static int -test3(const void *data ATTRIBUTE_UNUSED) +test3(const void *data G_GNUC_UNUSED) { const char *expect_wwnn = "2001001b32a9da4e"; const char *expect_wwpn = "2101001b32a9da4e"; @@ -165,7 +165,7 @@ test3(const void *data ATTRIBUTE_UNUSED) /* Test virVHBAGetHostByWWN */ static int -test4(const void *data ATTRIBUTE_UNUSED) +test4(const void *data G_GNUC_UNUSED) { const char *expect_hostname = "host5"; char *hostname = NULL; @@ -190,7 +190,7 @@ test4(const void *data ATTRIBUTE_UNUSED) * NB: host4 is not Online, so it should not be found */ static int -test5(const void *data ATTRIBUTE_UNUSED) +test5(const void *data G_GNUC_UNUSED) { const char *expect_hostname = "host5"; char *hostname = NULL; @@ -210,7 +210,7 @@ test5(const void *data ATTRIBUTE_UNUSED) /* Test virVHBAGetConfig fabric name optional */ static int -test6(const void *data ATTRIBUTE_UNUSED) +test6(const void *data G_GNUC_UNUSED) { const char *expect_wwnn = "2002001b32a9da4e"; const char *expect_wwpn = "2102001b32a9da4e"; diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c index 78844085a0..579eb2ec60 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -44,13 +44,13 @@ # endif static void -testCommandDryRun(const char *const*args ATTRIBUTE_UNUSED, - const char *const*env ATTRIBUTE_UNUSED, - const char *input ATTRIBUTE_UNUSED, +testCommandDryRun(const char *const*args G_GNUC_UNUSED, + const char *const*env G_GNUC_UNUSED, + const char *input G_GNUC_UNUSED, char **output, char **error, int *status, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { *status = 0; ignore_value(VIR_STRDUP_QUIET(*output, "")); diff --git a/tests/nsslinktest.c b/tests/nsslinktest.c index 5d7d36da9e..a2c4987792 100644 --- a/tests/nsslinktest.c +++ b/tests/nsslinktest.c @@ -21,8 +21,8 @@ #include "internal.h" #include "libvirt_nss.h" -int main(int argc ATTRIBUTE_UNUSED, - char *argv[] ATTRIBUTE_UNUSED) +int main(int argc G_GNUC_UNUSED, + char *argv[] G_GNUC_UNUSED) { int err, herrno; /* Dummy variables to prevent SIGSEGV */ diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c index 68b69a6e1f..61b3284397 100644 --- a/tests/nwfilterebiptablestest.c +++ b/tests/nwfilterebiptablestest.c @@ -66,7 +66,7 @@ "ebtables -t nat -X libvirt-P-vnet0\n" static int -testNWFilterEBIPTablesAllTeardown(const void *opaque ATTRIBUTE_UNUSED) +testNWFilterEBIPTablesAllTeardown(const void *opaque G_GNUC_UNUSED) { virBuffer buf = VIR_BUFFER_INITIALIZER; const char *expected = @@ -130,7 +130,7 @@ testNWFilterEBIPTablesAllTeardown(const void *opaque ATTRIBUTE_UNUSED) static int -testNWFilterEBIPTablesTearOldRules(const void *opaque ATTRIBUTE_UNUSED) +testNWFilterEBIPTablesTearOldRules(const void *opaque G_GNUC_UNUSED) { virBuffer buf = VIR_BUFFER_INITIALIZER; const char *expected = @@ -201,7 +201,7 @@ testNWFilterEBIPTablesTearOldRules(const void *opaque ATTRIBUTE_UNUSED) static int -testNWFilterEBIPTablesRemoveBasicRules(const void *opaque ATTRIBUTE_UNUSED) +testNWFilterEBIPTablesRemoveBasicRules(const void *opaque G_GNUC_UNUSED) { virBuffer buf = VIR_BUFFER_INITIALIZER; const char *expected = @@ -250,7 +250,7 @@ testNWFilterEBIPTablesRemoveBasicRules(const void *opaque ATTRIBUTE_UNUSED) static int -testNWFilterEBIPTablesTearNewRules(const void *opaque ATTRIBUTE_UNUSED) +testNWFilterEBIPTablesTearNewRules(const void *opaque G_GNUC_UNUSED) { virBuffer buf = VIR_BUFFER_INITIALIZER; const char *expected = @@ -284,7 +284,7 @@ testNWFilterEBIPTablesTearNewRules(const void *opaque ATTRIBUTE_UNUSED) static int -testNWFilterEBIPTablesApplyBasicRules(const void *opaque ATTRIBUTE_UNUSED) +testNWFilterEBIPTablesApplyBasicRules(const void *opaque G_GNUC_UNUSED) { virBuffer buf = VIR_BUFFER_INITIALIZER; const char *expected = @@ -356,7 +356,7 @@ testNWFilterEBIPTablesApplyBasicRules(const void *opaque ATTRIBUTE_UNUSED) static int -testNWFilterEBIPTablesApplyDHCPOnlyRules(const void *opaque ATTRIBUTE_UNUSED) +testNWFilterEBIPTablesApplyDHCPOnlyRules(const void *opaque G_GNUC_UNUSED) { virBuffer buf = VIR_BUFFER_INITIALIZER; const char *expected = @@ -447,7 +447,7 @@ testNWFilterEBIPTablesApplyDHCPOnlyRules(const void *opaque ATTRIBUTE_UNUSED) static int -testNWFilterEBIPTablesApplyDropAllRules(const void *opaque ATTRIBUTE_UNUSED) +testNWFilterEBIPTablesApplyDropAllRules(const void *opaque G_GNUC_UNUSED) { virBuffer buf = VIR_BUFFER_INITIALIZER; const char *expected = diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c index 9ba082d353..dac6938b63 100644 --- a/tests/objecteventtest.c +++ b/tests/objecteventtest.c @@ -101,10 +101,10 @@ typedef struct { static int -domainLifecycleCb(virConnectPtr conn ATTRIBUTE_UNUSED, - virDomainPtr dom ATTRIBUTE_UNUSED, +domainLifecycleCb(virConnectPtr conn G_GNUC_UNUSED, + virDomainPtr dom G_GNUC_UNUSED, int event, - int detail ATTRIBUTE_UNUSED, + int detail G_GNUC_UNUSED, void *opaque) { lifecycleEventCounter *counter = opaque; @@ -130,10 +130,10 @@ domainLifecycleCb(virConnectPtr conn ATTRIBUTE_UNUSED, } static void -networkLifecycleCb(virConnectPtr conn ATTRIBUTE_UNUSED, - virNetworkPtr net ATTRIBUTE_UNUSED, +networkLifecycleCb(virConnectPtr conn G_GNUC_UNUSED, + virNetworkPtr net G_GNUC_UNUSED, int event, - int detail ATTRIBUTE_UNUSED, + int detail G_GNUC_UNUSED, void* opaque) { lifecycleEventCounter *counter = opaque; @@ -149,10 +149,10 @@ networkLifecycleCb(virConnectPtr conn ATTRIBUTE_UNUSED, } static void -storagePoolLifecycleCb(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolPtr pool ATTRIBUTE_UNUSED, +storagePoolLifecycleCb(virConnectPtr conn G_GNUC_UNUSED, + virStoragePoolPtr pool G_GNUC_UNUSED, int event, - int detail ATTRIBUTE_UNUSED, + int detail G_GNUC_UNUSED, void* opaque) { lifecycleEventCounter *counter = opaque; @@ -172,8 +172,8 @@ storagePoolLifecycleCb(virConnectPtr conn ATTRIBUTE_UNUSED, } static void -storagePoolRefreshCb(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolPtr pool ATTRIBUTE_UNUSED, +storagePoolRefreshCb(virConnectPtr conn G_GNUC_UNUSED, + virStoragePoolPtr pool G_GNUC_UNUSED, void* opaque) { int *counter = opaque; @@ -182,10 +182,10 @@ storagePoolRefreshCb(virConnectPtr conn ATTRIBUTE_UNUSED, } static void -nodeDeviceLifecycleCb(virConnectPtr conn ATTRIBUTE_UNUSED, - virNodeDevicePtr dev ATTRIBUTE_UNUSED, +nodeDeviceLifecycleCb(virConnectPtr conn G_GNUC_UNUSED, + virNodeDevicePtr dev G_GNUC_UNUSED, int event, - int detail ATTRIBUTE_UNUSED, + int detail G_GNUC_UNUSED, void* opaque) { lifecycleEventCounter *counter = opaque; @@ -824,7 +824,7 @@ testNodeDeviceCreateXML(const void *data) } static void -timeout(int id ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) +timeout(int id G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { fputs("test taking too long; giving up", stderr); _exit(EXIT_FAILURE); diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c index 283ba03b21..b5e23d4d8d 100644 --- a/tests/openvzutilstest.c +++ b/tests/openvzutilstest.c @@ -14,8 +14,8 @@ # define VIR_FROM_THIS VIR_FROM_OPENVZ static int -testLocateConfFile(int vpsid ATTRIBUTE_UNUSED, char **conffile, - const char *ext ATTRIBUTE_UNUSED) +testLocateConfFile(int vpsid G_GNUC_UNUSED, char **conffile, + const char *ext G_GNUC_UNUSED) { return virAsprintf(conffile, "%s/openvzutilstest.conf", abs_srcdir); } @@ -33,7 +33,7 @@ static struct testConfigParam configParams[] = { }; static int -testReadConfigParam(const void *data ATTRIBUTE_UNUSED) +testReadConfigParam(const void *data G_GNUC_UNUSED) { int result = -1; size_t i; @@ -68,7 +68,7 @@ testReadConfigParam(const void *data ATTRIBUTE_UNUSED) } static int -testReadNetworkConf(const void *data ATTRIBUTE_UNUSED) +testReadNetworkConf(const void *data G_GNUC_UNUSED) { int result = -1; virDomainDefPtr def = NULL; diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 5ae098efa9..58f722cf1b 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -831,9 +831,9 @@ testQemuAgentArbitraryCommand(const void *data) static int -qemuAgentTimeoutTestMonitorHandler(qemuMonitorTestPtr test ATTRIBUTE_UNUSED, - qemuMonitorTestItemPtr item ATTRIBUTE_UNUSED, - const char *cmdstr ATTRIBUTE_UNUSED) +qemuAgentTimeoutTestMonitorHandler(qemuMonitorTestPtr test G_GNUC_UNUSED, + qemuMonitorTestItemPtr item G_GNUC_UNUSED, + const char *cmdstr G_GNUC_UNUSED) { return 0; } diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index 36af01d561..6837f2a0f6 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -30,7 +30,7 @@ static void -eventLoop(void *opaque ATTRIBUTE_UNUSED) +eventLoop(void *opaque G_GNUC_UNUSED) { while (1) { if (virEventRunDefaultImpl() < 0) { diff --git a/tests/qemucpumock.c b/tests/qemucpumock.c index 501738df36..74f25d8194 100644 --- a/tests/qemucpumock.c +++ b/tests/qemucpumock.c @@ -27,8 +27,8 @@ virCPUDefPtr -virQEMUCapsProbeHostCPU(virArch hostArch ATTRIBUTE_UNUSED, - virDomainCapsCPUModelsPtr models ATTRIBUTE_UNUSED) +virQEMUCapsProbeHostCPU(virArch hostArch G_GNUC_UNUSED, + virDomainCapsCPUModelsPtr models G_GNUC_UNUSED) { const char *model = getenv("VIR_TEST_MOCK_FAKE_HOST_CPU"); diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c index 653476fdc1..14710b11f3 100644 --- a/tests/qemufirmwaretest.c +++ b/tests/qemufirmwaretest.c @@ -55,7 +55,7 @@ testParseFormatFW(const void *opaque) static int -testFWPrecedence(const void *opaque ATTRIBUTE_UNUSED) +testFWPrecedence(const void *opaque G_GNUC_UNUSED) { VIR_AUTOFREE(char *) fakehome = NULL; VIR_AUTOSTRINGLIST fwList = NULL; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 9f2594b09a..64e73dcf01 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -360,8 +360,8 @@ qemuMonitorTestWorker(void *opaque) static void -qemuMonitorTestFreeTimer(int timer ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +qemuMonitorTestFreeTimer(int timer G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { /* nothing to be done here */ } @@ -712,7 +712,7 @@ qemuMonitorTestAddItemVerbatim(qemuMonitorTestPtr test, static int qemuMonitorTestProcessGuestAgentSync(qemuMonitorTestPtr test, - qemuMonitorTestItemPtr item ATTRIBUTE_UNUSED, + qemuMonitorTestItemPtr item G_GNUC_UNUSED, const char *cmdstr) { virJSONValuePtr val = NULL; @@ -1011,17 +1011,17 @@ qemuMonitorTestAddItemExpect(qemuMonitorTestPtr test, static void -qemuMonitorTestEOFNotify(qemuMonitorPtr mon ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +qemuMonitorTestEOFNotify(qemuMonitorPtr mon G_GNUC_UNUSED, + virDomainObjPtr vm G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { } static void -qemuMonitorTestErrorNotify(qemuMonitorPtr mon ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +qemuMonitorTestErrorNotify(qemuMonitorPtr mon G_GNUC_UNUSED, + virDomainObjPtr vm G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { } @@ -1034,8 +1034,8 @@ static qemuMonitorCallbacks qemuMonitorTestCallbacks = { static void -qemuMonitorTestAgentNotify(qemuAgentPtr agent ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED) +qemuMonitorTestAgentNotify(qemuAgentPtr agent G_GNUC_UNUSED, + virDomainObjPtr vm G_GNUC_UNUSED) { } diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c index 373d64305a..8b857b0cc1 100644 --- a/tests/qemusecuritymock.c +++ b/tests/qemusecuritymock.c @@ -302,7 +302,7 @@ mock_chown(const char *path, #include "virmockstathelpers.c" static int -virMockStatRedirect(const char *path ATTRIBUTE_UNUSED, char **newpath ATTRIBUTE_UNUSED) +virMockStatRedirect(const char *path G_GNUC_UNUSED, char **newpath G_GNUC_UNUSED) { return 0; } @@ -364,19 +364,19 @@ close(int fd) } -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 0; } -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 0; } diff --git a/tests/qemuvhostusertest.c b/tests/qemuvhostusertest.c index 52adf9834a..691c94b8fa 100644 --- a/tests/qemuvhostusertest.c +++ b/tests/qemuvhostusertest.c @@ -55,7 +55,7 @@ testParseFormatVU(const void *opaque) static int -testVUPrecedence(const void *opaque ATTRIBUTE_UNUSED) +testVUPrecedence(const void *opaque G_GNUC_UNUSED) { VIR_AUTOFREE(char *) fakehome = NULL; VIR_AUTOSTRINGLIST vuList = NULL; diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index a386dd17be..4c114212e9 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -111,17 +111,17 @@ virTPMCreateCancelPath(const char *devpath) * variables that support it. */ unsigned long long -virMemoryMaxValue(bool capped ATTRIBUTE_UNUSED) +virMemoryMaxValue(bool capped G_GNUC_UNUSED) { return LLONG_MAX; } char * -virSCSIDeviceGetSgName(const char *sysfs_prefix ATTRIBUTE_UNUSED, - const char *adapter ATTRIBUTE_UNUSED, - unsigned int bus ATTRIBUTE_UNUSED, - unsigned int target ATTRIBUTE_UNUSED, - unsigned long long unit ATTRIBUTE_UNUSED) +virSCSIDeviceGetSgName(const char *sysfs_prefix G_GNUC_UNUSED, + const char *adapter G_GNUC_UNUSED, + unsigned int bus G_GNUC_UNUSED, + unsigned int target G_GNUC_UNUSED, + unsigned long long unit G_GNUC_UNUSED) { char *ret; @@ -139,10 +139,10 @@ virSCSIVHostOpenVhostSCSI(int *vhostfd) 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) { size_t i; @@ -158,8 +158,8 @@ virNetDevTapCreate(char **ifname, } int -virNetDevSetMAC(const char *ifname ATTRIBUTE_UNUSED, - const virMacAddr *macaddr ATTRIBUTE_UNUSED) +virNetDevSetMAC(const char *ifname G_GNUC_UNUSED, + const virMacAddr *macaddr G_GNUC_UNUSED) { return 0; } @@ -172,24 +172,24 @@ virNetDevExists(const char *ifname) } -int virNetDevIPAddrAdd(const char *ifname ATTRIBUTE_UNUSED, - virSocketAddr *addr ATTRIBUTE_UNUSED, - virSocketAddr *peer ATTRIBUTE_UNUSED, - unsigned int prefix ATTRIBUTE_UNUSED) +int virNetDevIPAddrAdd(const char *ifname G_GNUC_UNUSED, + virSocketAddr *addr G_GNUC_UNUSED, + virSocketAddr *peer G_GNUC_UNUSED, + unsigned int prefix G_GNUC_UNUSED) { return 0; } int -virNetDevSetOnline(const char *ifname ATTRIBUTE_UNUSED, - bool online ATTRIBUTE_UNUSED) +virNetDevSetOnline(const char *ifname G_GNUC_UNUSED, + bool online G_GNUC_UNUSED) { return 0; } int -virNetDevRunEthernetScript(const char *ifname ATTRIBUTE_UNUSED, - const char *script ATTRIBUTE_UNUSED) +virNetDevRunEthernetScript(const char *ifname G_GNUC_UNUSED, + const char *script G_GNUC_UNUSED) { return 0; } @@ -226,14 +226,14 @@ virCommandPassFD(virCommandPtr cmd, } int -virNetDevOpenvswitchGetVhostuserIfname(const char *path ATTRIBUTE_UNUSED, +virNetDevOpenvswitchGetVhostuserIfname(const char *path G_GNUC_UNUSED, char **ifname) { return VIR_STRDUP(*ifname, "vhost-user0"); } int -qemuInterfaceOpenVhostNet(virDomainDefPtr def ATTRIBUTE_UNUSED, +qemuInterfaceOpenVhostNet(virDomainDefPtr def G_GNUC_UNUSED, virDomainNetDefPtr net, int *vhostfd, size_t *vhostfdSize) @@ -252,7 +252,7 @@ qemuInterfaceOpenVhostNet(virDomainDefPtr def ATTRIBUTE_UNUSED, int -qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev ATTRIBUTE_UNUSED) +qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev G_GNUC_UNUSED) { /* We need to return an FD number for a UNIX listener socket, @@ -269,8 +269,8 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev ATTRIBUTE_UNUSED) int -qemuBuildTPMOpenBackendFDs(const char *tpmdev ATTRIBUTE_UNUSED, - const char *cancel_path ATTRIBUTE_UNUSED, +qemuBuildTPMOpenBackendFDs(const char *tpmdev G_GNUC_UNUSED, + const char *cancel_path G_GNUC_UNUSED, int *tpmfd, int *cancelfd) { diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 834a289532..a84ea0954d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -37,10 +37,10 @@ static virQEMUDriver driver; static unsigned char * -fakeSecretGetValue(virSecretPtr obj ATTRIBUTE_UNUSED, +fakeSecretGetValue(virSecretPtr obj G_GNUC_UNUSED, size_t *value_size, - unsigned int fakeflags ATTRIBUTE_UNUSED, - unsigned int internalFlags ATTRIBUTE_UNUSED) + unsigned int fakeflags G_GNUC_UNUSED, + unsigned int internalFlags G_GNUC_UNUSED) { char *secret; if (VIR_STRDUP(secret, "AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A") < 0) @@ -199,7 +199,7 @@ fakeStorageVolGetPath(virStorageVolPtr vol) static char * fakeStoragePoolGetXMLDesc(virStoragePoolPtr pool, - unsigned int flags_unused ATTRIBUTE_UNUSED) + unsigned int flags_unused G_GNUC_UNUSED) { char *xmlpath = NULL; char *xmlbuf = NULL; @@ -278,7 +278,7 @@ fakeNWFilterBindingLookupByPortDev(virConnectPtr conn, static int -fakeNWFilterBindingDelete(virNWFilterBindingPtr binding ATTRIBUTE_UNUSED) +fakeNWFilterBindingDelete(virNWFilterBindingPtr binding G_GNUC_UNUSED) { return 0; } diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c index 6989e4fc4a..c1a7e2d603 100644 --- a/tests/scsihosttest.c +++ b/tests/scsihosttest.c @@ -168,7 +168,7 @@ init_scsihost_sysfs(const char *fakesysfsdir) /* Test virReadSCSIUniqueId */ static int -testVirReadSCSIUniqueId(const void *data ATTRIBUTE_UNUSED) +testVirReadSCSIUniqueId(const void *data G_GNUC_UNUSED) { int hostnum, unique_id; @@ -198,7 +198,7 @@ testVirReadSCSIUniqueId(const void *data ATTRIBUTE_UNUSED) /* Test virSCSIHostFindByPCI */ static int -testVirFindSCSIHostByPCI(const void *data ATTRIBUTE_UNUSED) +testVirFindSCSIHostByPCI(const void *data G_GNUC_UNUSED) { unsigned int unique_id1 = 1; unsigned int unique_id2 = 2; diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index a2864cf57c..5dccb708d8 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -106,7 +106,7 @@ testSELinuxCheckCon(context_t con, const char *role, const char *type, int sensMin, - int sensMax ATTRIBUTE_UNUSED, + int sensMax G_GNUC_UNUSED, int catMin, int catMax) { diff --git a/tests/shunloadhelper.c b/tests/shunloadhelper.c index 952cade741..cc7d4954a5 100644 --- a/tests/shunloadhelper.c +++ b/tests/shunloadhelper.c @@ -30,8 +30,8 @@ #include "internal.h" -static void shunloadError(void *userData ATTRIBUTE_UNUSED, - virErrorPtr error ATTRIBUTE_UNUSED) +static void shunloadError(void *userData G_GNUC_UNUSED, + virErrorPtr error G_GNUC_UNUSED) { } diff --git a/tests/shunloadtest.c b/tests/shunloadtest.c index c5561175b9..65c627ed17 100644 --- a/tests/shunloadtest.c +++ b/tests/shunloadtest.c @@ -90,7 +90,7 @@ static void sigHandler(int sig) * we don't want 'shunloadtest' itself to link against * libvirt.so. We need to test dlopen()'ing of libvirt.so */ -int main(int argc ATTRIBUTE_UNUSED, char **argv) +int main(int argc G_GNUC_UNUSED, char **argv) { void (*startup)(void); pthread_t t; diff --git a/tests/testutils.c b/tests/testutils.c index 1f3718b5cd..80b7b083ff 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -380,9 +380,9 @@ virTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen) } #else /* !WIN32 */ int -virTestCaptureProgramOutput(const char *const argv[] ATTRIBUTE_UNUSED, - char **buf ATTRIBUTE_UNUSED, - int maxlen ATTRIBUTE_UNUSED) +virTestCaptureProgramOutput(const char *const argv[] G_GNUC_UNUSED, + char **buf G_GNUC_UNUSED, + int maxlen G_GNUC_UNUSED) { return -1; } @@ -713,8 +713,8 @@ virTestCompareToString(const char *expect, } static void -virTestErrorFuncQuiet(void *data ATTRIBUTE_UNUSED, - virErrorPtr err ATTRIBUTE_UNUSED) +virTestErrorFuncQuiet(void *data G_GNUC_UNUSED, + virErrorPtr err G_GNUC_UNUSED) { } @@ -733,15 +733,15 @@ struct virtTestLogData { static struct virtTestLogData testLog = { VIR_BUFFER_INITIALIZER }; static void -virtTestLogOutput(virLogSourcePtr source ATTRIBUTE_UNUSED, - virLogPriority priority ATTRIBUTE_UNUSED, - const char *filename ATTRIBUTE_UNUSED, - int lineno ATTRIBUTE_UNUSED, - const char *funcname ATTRIBUTE_UNUSED, +virtTestLogOutput(virLogSourcePtr source G_GNUC_UNUSED, + virLogPriority priority G_GNUC_UNUSED, + const char *filename G_GNUC_UNUSED, + int lineno 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) { diff --git a/tests/testutilsqemuschema.c b/tests/testutilsqemuschema.c index 3773f63ecb..42b2550a03 100644 --- a/tests/testutilsqemuschema.c +++ b/tests/testutilsqemuschema.c @@ -157,7 +157,7 @@ testQEMUSchemaValidateObjectMember(const char *key, static int -testQEMUSchemaValidateObjectMergeVariantMember(size_t pos ATTRIBUTE_UNUSED, +testQEMUSchemaValidateObjectMergeVariantMember(size_t pos G_GNUC_UNUSED, virJSONValuePtr item, void *opaque) { @@ -245,9 +245,9 @@ testQEMUSchemaValidateObjectMergeVariant(virJSONValuePtr root, static int -testQEMUSchemaValidateObjectMandatoryMember(size_t pos ATTRIBUTE_UNUSED, +testQEMUSchemaValidateObjectMandatoryMember(size_t pos G_GNUC_UNUSED, virJSONValuePtr item, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { struct testQEMUSchemaValidateObjectMemberData *data = opaque; diff --git a/tests/utiltest.c b/tests/utiltest.c index 71b8d869bd..176e6ca20a 100644 --- a/tests/utiltest.c +++ b/tests/utiltest.c @@ -39,7 +39,7 @@ static const char* diskNamesInvalid[] = { }; static int -testIndexToDiskName(const void *data ATTRIBUTE_UNUSED) +testIndexToDiskName(const void *data G_GNUC_UNUSED) { size_t i; char *diskName = NULL; @@ -65,7 +65,7 @@ testIndexToDiskName(const void *data ATTRIBUTE_UNUSED) static int -testDiskNameToIndex(const void *data ATTRIBUTE_UNUSED) +testDiskNameToIndex(const void *data G_GNUC_UNUSED) { size_t i; int idx; @@ -95,7 +95,7 @@ testDiskNameToIndex(const void *data ATTRIBUTE_UNUSED) static int -testDiskNameParse(const void *data ATTRIBUTE_UNUSED) +testDiskNameParse(const void *data G_GNUC_UNUSED) { size_t i; int idx; @@ -155,7 +155,7 @@ static struct testVersionString versions[] = { }; static int -testParseVersionString(const void *data ATTRIBUTE_UNUSED) +testParseVersionString(const void *data G_GNUC_UNUSED) { int result; size_t i; @@ -205,7 +205,7 @@ static struct testRoundData roundData[] = { }; static int -testRoundValueToPowerOfTwo(const void *data ATTRIBUTE_UNUSED) +testRoundValueToPowerOfTwo(const void *data G_GNUC_UNUSED) { unsigned int result; size_t i; @@ -234,7 +234,7 @@ testRoundValueToPowerOfTwo(const void *data ATTRIBUTE_UNUSED) } static int -testOverflowCheckMacro(const void *data ATTRIBUTE_UNUSED) +testOverflowCheckMacro(const void *data G_GNUC_UNUSED) { long long tmp; uint8_t luchar; diff --git a/tests/viralloctest.c b/tests/viralloctest.c index 27cbdcbbe4..75e639675b 100644 --- a/tests/viralloctest.c +++ b/tests/viralloctest.c @@ -44,7 +44,7 @@ testCheckNonNull(void *t) } static int -testAllocScalar(const void *opaque ATTRIBUTE_UNUSED) +testAllocScalar(const void *opaque G_GNUC_UNUSED) { testDummyStruct *t; int ret = -1; @@ -76,7 +76,7 @@ testAllocScalar(const void *opaque ATTRIBUTE_UNUSED) static int -testAllocArray(const void *opaque ATTRIBUTE_UNUSED) +testAllocArray(const void *opaque G_GNUC_UNUSED) { testDummyStruct *t; size_t nt = 10, i; @@ -111,7 +111,7 @@ testAllocArray(const void *opaque ATTRIBUTE_UNUSED) static int -testReallocArray(const void *opaque ATTRIBUTE_UNUSED) +testReallocArray(const void *opaque G_GNUC_UNUSED) { testDummyStruct *t; size_t nt = 10, i; @@ -185,7 +185,7 @@ testReallocArray(const void *opaque ATTRIBUTE_UNUSED) static int -testExpandArray(const void *opaque ATTRIBUTE_UNUSED) +testExpandArray(const void *opaque G_GNUC_UNUSED) { testDummyStruct *t; size_t nt = 10, i; @@ -265,7 +265,7 @@ testExpandArray(const void *opaque ATTRIBUTE_UNUSED) static int -testResizeArray(const void *opaque ATTRIBUTE_UNUSED) +testResizeArray(const void *opaque G_GNUC_UNUSED) { testDummyStruct *t; size_t nt = 10, at, i; @@ -326,7 +326,7 @@ testResizeArray(const void *opaque ATTRIBUTE_UNUSED) static int -testInsertArray(const void *opaque ATTRIBUTE_UNUSED) +testInsertArray(const void *opaque G_GNUC_UNUSED) { testDummyStruct **t; size_t nt = 10, i; @@ -384,7 +384,7 @@ testInsertArray(const void *opaque ATTRIBUTE_UNUSED) static int -testDispose(const void *opaque ATTRIBUTE_UNUSED) +testDispose(const void *opaque G_GNUC_UNUSED) { int *num = NULL; int *nums = NULL; diff --git a/tests/viratomictest.c b/tests/viratomictest.c index a933ab1cbd..8c885a5b96 100644 --- a/tests/viratomictest.c +++ b/tests/viratomictest.c @@ -29,7 +29,7 @@ #include "virthread.h" static int -testTypes(const void *data ATTRIBUTE_UNUSED) +testTypes(const void *data G_GNUC_UNUSED) { unsigned int u, u2; int s, s2; @@ -131,7 +131,7 @@ thread_func(void *data) } static int -testThreads(const void *data ATTRIBUTE_UNUSED) +testThreads(const void *data G_GNUC_UNUSED) { int sum; size_t i; diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index cafe865dde..9fec1fcc6e 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -27,7 +27,7 @@ #include "virbitmap.h" static int -test1(const void *data ATTRIBUTE_UNUSED) +test1(const void *data G_GNUC_UNUSED) { virBitmapPtr bitmap; int size; @@ -82,7 +82,7 @@ testBit(virBitmapPtr bitmap, } static int -test2(const void *data ATTRIBUTE_UNUSED) +test2(const void *data G_GNUC_UNUSED) { const char *bitsString1 = "1-32,50,88-99,1021-1023"; char *bitsString2 = NULL; @@ -145,7 +145,7 @@ test2(const void *data ATTRIBUTE_UNUSED) } static int -test3(const void *data ATTRIBUTE_UNUSED) +test3(const void *data G_GNUC_UNUSED) { virBitmapPtr bitmap = NULL; int ret = -1; @@ -173,7 +173,7 @@ test3(const void *data ATTRIBUTE_UNUSED) /* test for virBitmapNextSetBit, virBitmapLastSetBit, virBitmapNextClearBit */ static int -test4(const void *data ATTRIBUTE_UNUSED) +test4(const void *data G_GNUC_UNUSED) { const char *bitsString = "0, 2-4, 6-10, 12, 14-18, 20, 22, 25"; int size = 40; @@ -296,7 +296,7 @@ test4(const void *data ATTRIBUTE_UNUSED) /* test for virBitmapNewData/ToData/DataFormat */ static int -test5(const void *v ATTRIBUTE_UNUSED) +test5(const void *v G_GNUC_UNUSED) { char data[] = {0x01, 0x02, 0x00, 0x00, 0x04}; unsigned char *data2 = NULL; @@ -357,7 +357,7 @@ test5(const void *v ATTRIBUTE_UNUSED) /* test for virBitmapFormat */ static int -test6(const void *v ATTRIBUTE_UNUSED) +test6(const void *v G_GNUC_UNUSED) { virBitmapPtr bitmap = NULL; char *str = NULL; @@ -439,7 +439,7 @@ test6(const void *v ATTRIBUTE_UNUSED) } static int -test7(const void *v ATTRIBUTE_UNUSED) +test7(const void *v G_GNUC_UNUSED) { virBitmapPtr bitmap; size_t i; @@ -479,7 +479,7 @@ test7(const void *v ATTRIBUTE_UNUSED) } static int -test8(const void *v ATTRIBUTE_UNUSED) +test8(const void *v G_GNUC_UNUSED) { virBitmapPtr bitmap = NULL; char data[108] = {0x00,}; @@ -507,7 +507,7 @@ test8(const void *v ATTRIBUTE_UNUSED) /* test out of bounds conditions on virBitmapParse */ static int -test9(const void *opaque ATTRIBUTE_UNUSED) +test9(const void *opaque G_GNUC_UNUSED) { int ret = -1; virBitmapPtr bitmap = NULL; @@ -538,7 +538,7 @@ test9(const void *opaque ATTRIBUTE_UNUSED) } static int -test10(const void *opaque ATTRIBUTE_UNUSED) +test10(const void *opaque G_GNUC_UNUSED) { int ret = -1; virBitmapPtr b1 = NULL, b2 = NULL, b3 = NULL, b4 = NULL; @@ -630,7 +630,7 @@ test11(const void *opaque) /* test self-expanding bitmap APIs */ static int -test12(const void *opaque ATTRIBUTE_UNUSED) +test12(const void *opaque G_GNUC_UNUSED) { virBitmapPtr map = NULL; int ret = -1; @@ -672,7 +672,7 @@ test12(const void *opaque ATTRIBUTE_UNUSED) /* virBitmap(New/To)String */ static int -test13(const void *opaque ATTRIBUTE_UNUSED) +test13(const void *opaque G_GNUC_UNUSED) { virBitmapPtr map = NULL; const char *strings[] = { "1234feebee", "000c0fefe" }; diff --git a/tests/virbuftest.c b/tests/virbuftest.c index a7eaef636d..f547afe7f7 100644 --- a/tests/virbuftest.c +++ b/tests/virbuftest.c @@ -52,7 +52,7 @@ static int testBufInfiniteLoop(const void *data) return ret; } -static int testBufAutoIndent(const void *data ATTRIBUTE_UNUSED) +static int testBufAutoIndent(const void *data G_GNUC_UNUSED) { virBuffer bufinit = VIR_BUFFER_INITIALIZER; virBufferPtr buf = &bufinit; @@ -144,7 +144,7 @@ static int testBufAutoIndent(const void *data ATTRIBUTE_UNUSED) return ret; } -static int testBufTrim(const void *data ATTRIBUTE_UNUSED) +static int testBufTrim(const void *data G_GNUC_UNUSED) { virBuffer bufinit = VIR_BUFFER_INITIALIZER; virBufferPtr buf = NULL; @@ -192,7 +192,7 @@ static int testBufTrim(const void *data ATTRIBUTE_UNUSED) return ret; } -static int testBufAddBuffer(const void *data ATTRIBUTE_UNUSED) +static int testBufAddBuffer(const void *data G_GNUC_UNUSED) { virBuffer buf1 = VIR_BUFFER_INITIALIZER; virBuffer buf2 = VIR_BUFFER_INITIALIZER; @@ -304,7 +304,7 @@ static int testBufAddBuffer(const void *data ATTRIBUTE_UNUSED) } static int -testBufAddBuffer2(const void *opaque ATTRIBUTE_UNUSED) +testBufAddBuffer2(const void *opaque G_GNUC_UNUSED) { VIR_AUTOCLEAN(virBuffer) buf1 = VIR_BUFFER_INITIALIZER; VIR_AUTOCLEAN(virBuffer) buf2 = VIR_BUFFER_INITIALIZER; @@ -335,7 +335,7 @@ struct testBufAddStrData { }; static int -testBufAddStr(const void *opaque ATTRIBUTE_UNUSED) +testBufAddStr(const void *opaque G_GNUC_UNUSED) { const struct testBufAddStrData *data = opaque; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -368,7 +368,7 @@ testBufAddStr(const void *opaque ATTRIBUTE_UNUSED) static int -testBufEscapeStr(const void *opaque ATTRIBUTE_UNUSED) +testBufEscapeStr(const void *opaque G_GNUC_UNUSED) { const struct testBufAddStrData *data = opaque; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -430,7 +430,7 @@ testBufEscapeRegex(const void *opaque) static int -testBufSetIndent(const void *opaque ATTRIBUTE_UNUSED) +testBufSetIndent(const void *opaque G_GNUC_UNUSED) { virBuffer buf = VIR_BUFFER_INITIALIZER; char *actual; @@ -459,7 +459,7 @@ testBufSetIndent(const void *opaque ATTRIBUTE_UNUSED) /* Result of this shows up only in valgrind or similar */ static int -testBufferAutoclean(const void *opaque ATTRIBUTE_UNUSED) +testBufferAutoclean(const void *opaque G_GNUC_UNUSED) { VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; diff --git a/tests/vircapstest.c b/tests/vircapstest.c index 7fc0ebe4f6..8c5982c9ac 100644 --- a/tests/vircapstest.c +++ b/tests/vircapstest.c @@ -30,7 +30,7 @@ static int -test_virCapabilitiesGetCpusForNodemask(const void *data ATTRIBUTE_UNUSED) +test_virCapabilitiesGetCpusForNodemask(const void *data G_GNUC_UNUSED) { const char *nodestr = "3,4,5,6"; virBitmapPtr nodemask = NULL; @@ -63,7 +63,7 @@ test_virCapabilitiesGetCpusForNodemask(const void *data ATTRIBUTE_UNUSED) } -static bool ATTRIBUTE_UNUSED +static bool G_GNUC_UNUSED doCapsExpectFailure(virCapsPtr caps, int ostype, virArch arch, @@ -82,7 +82,7 @@ doCapsExpectFailure(virCapsPtr caps, return true; } -static bool ATTRIBUTE_UNUSED +static bool G_GNUC_UNUSED doCapsCompare(virCapsPtr caps, int ostype, virArch arch, @@ -153,7 +153,7 @@ doCapsCompare(virCapsPtr caps, #ifdef WITH_QEMU static int -test_virCapsDomainDataLookupQEMU(const void *data ATTRIBUTE_UNUSED) +test_virCapsDomainDataLookupQEMU(const void *data G_GNUC_UNUSED) { int ret = 0; virCapsPtr caps = NULL; @@ -212,7 +212,7 @@ test_virCapsDomainDataLookupQEMU(const void *data ATTRIBUTE_UNUSED) #ifdef WITH_LXC static int -test_virCapsDomainDataLookupLXC(const void *data ATTRIBUTE_UNUSED) +test_virCapsDomainDataLookupLXC(const void *data G_GNUC_UNUSED) { int ret = 0; virCapsPtr caps = NULL; diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index e862b132f0..ec58d71a63 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -228,7 +228,7 @@ testCgroupDetectMounts(const void *args) } -static int testCgroupNewForSelf(const void *args ATTRIBUTE_UNUSED) +static int testCgroupNewForSelf(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup = NULL; int ret = -1; @@ -268,7 +268,7 @@ static int testCgroupNewForSelf(const void *args ATTRIBUTE_UNUSED) /* Asking for impossible combination since CPU is co-mounted */ -static int testCgroupNewForPartition(const void *args ATTRIBUTE_UNUSED) +static int testCgroupNewForPartition(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup = NULL; int ret = -1; @@ -342,7 +342,7 @@ static int testCgroupNewForPartition(const void *args ATTRIBUTE_UNUSED) } -static int testCgroupNewForPartitionNested(const void *args ATTRIBUTE_UNUSED) +static int testCgroupNewForPartitionNested(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup = NULL; int ret = -1; @@ -392,7 +392,7 @@ static int testCgroupNewForPartitionNested(const void *args ATTRIBUTE_UNUSED) } -static int testCgroupNewForPartitionNestedDeep(const void *args ATTRIBUTE_UNUSED) +static int testCgroupNewForPartitionNestedDeep(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup = NULL; int ret = -1; @@ -449,7 +449,7 @@ static int testCgroupNewForPartitionNestedDeep(const void *args ATTRIBUTE_UNUSED -static int testCgroupNewForPartitionDomain(const void *args ATTRIBUTE_UNUSED) +static int testCgroupNewForPartitionDomain(const void *args G_GNUC_UNUSED) { virCgroupPtr partitioncgroup = NULL; virCgroupPtr domaincgroup = NULL; @@ -484,7 +484,7 @@ static int testCgroupNewForPartitionDomain(const void *args ATTRIBUTE_UNUSED) return ret; } -static int testCgroupNewForPartitionDomainEscaped(const void *args ATTRIBUTE_UNUSED) +static int testCgroupNewForPartitionDomainEscaped(const void *args G_GNUC_UNUSED) { virCgroupPtr partitioncgroup1 = NULL; virCgroupPtr partitioncgroup2 = NULL; @@ -537,7 +537,7 @@ static int testCgroupNewForPartitionDomainEscaped(const void *args ATTRIBUTE_UNU return ret; } -static int testCgroupNewForSelfAllInOne(const void *args ATTRIBUTE_UNUSED) +static int testCgroupNewForSelfAllInOne(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup = NULL; int ret = -1; @@ -564,7 +564,7 @@ static int testCgroupNewForSelfAllInOne(const void *args ATTRIBUTE_UNUSED) } -static int testCgroupNewForSelfLogind(const void *args ATTRIBUTE_UNUSED) +static int testCgroupNewForSelfLogind(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup = NULL; @@ -578,7 +578,7 @@ static int testCgroupNewForSelfLogind(const void *args ATTRIBUTE_UNUSED) } -static int testCgroupNewForSelfUnified(const void *args ATTRIBUTE_UNUSED) +static int testCgroupNewForSelfUnified(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup = NULL; int ret = -1; @@ -602,7 +602,7 @@ static int testCgroupNewForSelfUnified(const void *args ATTRIBUTE_UNUSED) } -static int testCgroupNewForSelfHybrid(const void *args ATTRIBUTE_UNUSED) +static int testCgroupNewForSelfHybrid(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup = NULL; int ret = -1; @@ -655,7 +655,7 @@ static int testCgroupAvailable(const void *args) return 0; } -static int testCgroupControllerAvailable(const void *args ATTRIBUTE_UNUSED) +static int testCgroupControllerAvailable(const void *args G_GNUC_UNUSED) { int ret = 0; @@ -683,7 +683,7 @@ static int testCgroupControllerAvailable(const void *args ATTRIBUTE_UNUSED) return ret; } -static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED) +static int testCgroupGetPercpuStats(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup = NULL; size_t i; @@ -768,7 +768,7 @@ static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED) return ret; } -static int testCgroupGetMemoryUsage(const void *args ATTRIBUTE_UNUSED) +static int testCgroupGetMemoryUsage(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup = NULL; int rv, ret = -1; @@ -802,7 +802,7 @@ static int testCgroupGetMemoryUsage(const void *args ATTRIBUTE_UNUSED) static int -testCgroupGetMemoryStat(const void *args ATTRIBUTE_UNUSED) +testCgroupGetMemoryStat(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup = NULL; int rv; @@ -861,7 +861,7 @@ testCgroupGetMemoryStat(const void *args ATTRIBUTE_UNUSED) } -static int testCgroupGetBlkioIoServiced(const void *args ATTRIBUTE_UNUSED) +static int testCgroupGetBlkioIoServiced(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup = NULL; size_t i; @@ -911,7 +911,7 @@ static int testCgroupGetBlkioIoServiced(const void *args ATTRIBUTE_UNUSED) return ret; } -static int testCgroupGetBlkioIoDeviceServiced(const void *args ATTRIBUTE_UNUSED) +static int testCgroupGetBlkioIoDeviceServiced(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup = NULL; size_t i; diff --git a/tests/virconftest.c b/tests/virconftest.c index f61e4ea9d5..eb8c9cb579 100644 --- a/tests/virconftest.c +++ b/tests/virconftest.c @@ -72,7 +72,7 @@ static int testConfRoundTrip(const void *opaque) } -static int testConfMemoryNoNewline(const void *opaque ATTRIBUTE_UNUSED) +static int testConfMemoryNoNewline(const void *opaque G_GNUC_UNUSED) { const char *srcdata = \ "ullong = '123456789'\n" \ @@ -137,7 +137,7 @@ static int testConfMemoryNoNewline(const void *opaque ATTRIBUTE_UNUSED) } -static int testConfParseInt(const void *opaque ATTRIBUTE_UNUSED) +static int testConfParseInt(const void *opaque G_GNUC_UNUSED) { const char *srcdata = \ "int = -1729\n" \ @@ -285,7 +285,7 @@ static int testConfParseInt(const void *opaque ATTRIBUTE_UNUSED) return 0; } -static int testConfParseBool(const void *opaque ATTRIBUTE_UNUSED) +static int testConfParseBool(const void *opaque G_GNUC_UNUSED) { const char *srcdata = \ "false = 0\n" \ @@ -346,7 +346,7 @@ static int testConfParseBool(const void *opaque ATTRIBUTE_UNUSED) } -static int testConfParseString(const void *opaque ATTRIBUTE_UNUSED) +static int testConfParseString(const void *opaque G_GNUC_UNUSED) { const char *srcdata = \ "int = 6963472309248\n" \ @@ -385,7 +385,7 @@ static int testConfParseString(const void *opaque ATTRIBUTE_UNUSED) } -static int testConfParseStringList(const void *opaque ATTRIBUTE_UNUSED) +static int testConfParseStringList(const void *opaque G_GNUC_UNUSED) { const char *srcdata = \ "string_list = [\"foo\", \"bar\"]\n" \ diff --git a/tests/virdbustest.c b/tests/virdbustest.c index ec380e8fc2..f9c2fb9587 100644 --- a/tests/virdbustest.c +++ b/tests/virdbustest.c @@ -47,7 +47,7 @@ VIR_LOG_INIT("tests.dbustest"); } \ } while (0) -static int testMessageSimple(const void *args ATTRIBUTE_UNUSED) +static int testMessageSimple(const void *args G_GNUC_UNUSED) { DBusMessage *msg = NULL; int ret = -1; @@ -123,7 +123,7 @@ static int testMessageSimple(const void *args ATTRIBUTE_UNUSED) } -static int testMessageVariant(const void *args ATTRIBUTE_UNUSED) +static int testMessageVariant(const void *args G_GNUC_UNUSED) { DBusMessage *msg = NULL; int ret = -1; @@ -172,7 +172,7 @@ static int testMessageVariant(const void *args ATTRIBUTE_UNUSED) return ret; } -static int testMessageArray(const void *args ATTRIBUTE_UNUSED) +static int testMessageArray(const void *args G_GNUC_UNUSED) { DBusMessage *msg = NULL; int ret = -1; @@ -231,7 +231,7 @@ static int testMessageArray(const void *args ATTRIBUTE_UNUSED) return ret; } -static int testMessageEmptyArrayRef(const void *args ATTRIBUTE_UNUSED) +static int testMessageEmptyArrayRef(const void *args G_GNUC_UNUSED) { DBusMessage *msg = NULL; int ret = -1; @@ -275,7 +275,7 @@ static int testMessageEmptyArrayRef(const void *args ATTRIBUTE_UNUSED) return ret; } -static int testMessageSingleArrayRef(const void *args ATTRIBUTE_UNUSED) +static int testMessageSingleArrayRef(const void *args G_GNUC_UNUSED) { DBusMessage *msg = NULL; int ret = -1; @@ -325,7 +325,7 @@ static int testMessageSingleArrayRef(const void *args ATTRIBUTE_UNUSED) return ret; } -static int testMessageArrayRef(const void *args ATTRIBUTE_UNUSED) +static int testMessageArrayRef(const void *args G_GNUC_UNUSED) { DBusMessage *msg = NULL; int ret = -1; @@ -438,7 +438,7 @@ static int testMessageArrayRef(const void *args ATTRIBUTE_UNUSED) return ret; } -static int testMessageStruct(const void *args ATTRIBUTE_UNUSED) +static int testMessageStruct(const void *args G_GNUC_UNUSED) { DBusMessage *msg = NULL; int ret = -1; @@ -514,7 +514,7 @@ static int testMessageStruct(const void *args ATTRIBUTE_UNUSED) } -static int testMessageDict(const void *args ATTRIBUTE_UNUSED) +static int testMessageDict(const void *args G_GNUC_UNUSED) { DBusMessage *msg = NULL; int ret = -1; @@ -583,7 +583,7 @@ static int testMessageDict(const void *args ATTRIBUTE_UNUSED) return ret; } -static int testMessageDictRef(const void *args ATTRIBUTE_UNUSED) +static int testMessageDictRef(const void *args G_GNUC_UNUSED) { DBusMessage *msg = NULL; int ret = -1; @@ -654,7 +654,7 @@ static int testMessageDictRef(const void *args ATTRIBUTE_UNUSED) return ret; } -static int testMessageEmptyDictRef(const void *args ATTRIBUTE_UNUSED) +static int testMessageEmptyDictRef(const void *args G_GNUC_UNUSED) { DBusMessage *msg = NULL; int ret = -1; diff --git a/tests/virdeterministichashmock.c b/tests/virdeterministichashmock.c index 3237f56a6c..4d0c88f600 100644 --- a/tests/virdeterministichashmock.c +++ b/tests/virdeterministichashmock.c @@ -23,7 +23,7 @@ uint32_t virHashCodeGen(const void *key, size_t len, - uint32_t seed ATTRIBUTE_UNUSED) + uint32_t seed G_GNUC_UNUSED) { const uint8_t *k = key; uint32_t h = 0; diff --git a/tests/virendiantest.c b/tests/virendiantest.c index 263acc8e52..7e2eff66dc 100644 --- a/tests/virendiantest.c +++ b/tests/virendiantest.c @@ -24,7 +24,7 @@ #include "virendian.h" static int -test1(const void *data ATTRIBUTE_UNUSED) +test1(const void *data G_GNUC_UNUSED) { /* Regular char should work, even if signed, and even with * unaligned access. */ @@ -65,7 +65,7 @@ test1(const void *data ATTRIBUTE_UNUSED) } static int -test2(const void *data ATTRIBUTE_UNUSED) +test2(const void *data G_GNUC_UNUSED) { /* Unsigned char should work without cast, even if unaligned access. */ unsigned char array[] = { 1, 2, 3, 4, 5, 6, 7, 8, diff --git a/tests/virerrortest.c b/tests/virerrortest.c index 63ba84c2f9..85f4071ae8 100644 --- a/tests/virerrortest.c +++ b/tests/virerrortest.c @@ -53,7 +53,7 @@ virErrorTestMsgFormatInfoOne(const char *msg) static int -virErrorTestMsgs(const void *opaque ATTRIBUTE_UNUSED) +virErrorTestMsgs(const void *opaque G_GNUC_UNUSED) { const char *err_noinfo; const char *err_info; diff --git a/tests/virfilecachemock.c b/tests/virfilecachemock.c index a7476bce2e..15091c7af9 100644 --- a/tests/virfilecachemock.c +++ b/tests/virfilecachemock.c @@ -25,7 +25,7 @@ int -unlink(const char *path ATTRIBUTE_UNUSED) +unlink(const char *path G_GNUC_UNUSED) { return 0; } diff --git a/tests/virfilecachetest.c b/tests/virfilecachetest.c index a17086e004..e3c6401934 100644 --- a/tests/virfilecachetest.c +++ b/tests/virfilecachetest.c @@ -103,7 +103,7 @@ testFileCacheIsValid(void *data, static void * -testFileCacheNewData(const char *name ATTRIBUTE_UNUSED, +testFileCacheNewData(const char *name G_GNUC_UNUSED, void *priv) { testFileCachePrivPtr testPriv = priv; @@ -114,8 +114,8 @@ testFileCacheNewData(const char *name ATTRIBUTE_UNUSED, static void * testFileCacheLoadFile(const char *filename, - const char *name ATTRIBUTE_UNUSED, - void *priv ATTRIBUTE_UNUSED) + const char *name G_GNUC_UNUSED, + void *priv G_GNUC_UNUSED) { testFileCacheObjPtr obj; char *data; @@ -131,8 +131,8 @@ testFileCacheLoadFile(const char *filename, static int -testFileCacheSaveFile(void *data ATTRIBUTE_UNUSED, - const char *filename ATTRIBUTE_UNUSED, +testFileCacheSaveFile(void *data G_GNUC_UNUSED, + const char *filename G_GNUC_UNUSED, void *priv) { testFileCachePrivPtr testPriv = priv; diff --git a/tests/virfiletest.c b/tests/virfiletest.c index 14be2d9d60..cda29bb735 100644 --- a/tests/virfiletest.c +++ b/tests/virfiletest.c @@ -236,8 +236,8 @@ holesSupported(void) #else /* !HAVE_DECL_SEEK_HOLE || !defined(__linux__)*/ static int -makeSparseFile(const off_t offsets[] ATTRIBUTE_UNUSED, - const bool startData ATTRIBUTE_UNUSED) +makeSparseFile(const off_t offsets[] G_GNUC_UNUSED, + const bool startData G_GNUC_UNUSED) { return -1; } @@ -315,7 +315,7 @@ struct testFileIsSharedFSType { }; static int -testFileIsSharedFSType(const void *opaque ATTRIBUTE_UNUSED) +testFileIsSharedFSType(const void *opaque G_GNUC_UNUSED) { #ifndef __linux__ return EXIT_AM_SKIP; diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index 7e4e80e09b..3325986b2d 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -322,7 +322,7 @@ testFirewallRemoveRule(const void *opaque) static int -testFirewallManyGroups(const void *opaque ATTRIBUTE_UNUSED) +testFirewallManyGroups(const void *opaque G_GNUC_UNUSED) { virBuffer cmdbuf = VIR_BUFFER_INITIALIZER; virFirewallPtr fw = NULL; @@ -395,12 +395,12 @@ testFirewallManyGroups(const void *opaque ATTRIBUTE_UNUSED) static void testFirewallRollbackHook(const char *const*args, - const char *const*env ATTRIBUTE_UNUSED, - const char *input ATTRIBUTE_UNUSED, - char **output ATTRIBUTE_UNUSED, - char **error ATTRIBUTE_UNUSED, + const char *const*env G_GNUC_UNUSED, + const char *input G_GNUC_UNUSED, + char **output G_GNUC_UNUSED, + char **error G_GNUC_UNUSED, int *status, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { bool isAdd = false; while (*args) { @@ -416,7 +416,7 @@ testFirewallRollbackHook(const char *const*args, } static int -testFirewallIgnoreFailGroup(const void *opaque ATTRIBUTE_UNUSED) +testFirewallIgnoreFailGroup(const void *opaque G_GNUC_UNUSED) { virBuffer cmdbuf = VIR_BUFFER_INITIALIZER; virFirewallPtr fw = NULL; @@ -491,7 +491,7 @@ testFirewallIgnoreFailGroup(const void *opaque ATTRIBUTE_UNUSED) static int -testFirewallIgnoreFailRule(const void *opaque ATTRIBUTE_UNUSED) +testFirewallIgnoreFailRule(const void *opaque G_GNUC_UNUSED) { virBuffer cmdbuf = VIR_BUFFER_INITIALIZER; virFirewallPtr fw = NULL; @@ -565,7 +565,7 @@ testFirewallIgnoreFailRule(const void *opaque ATTRIBUTE_UNUSED) static int -testFirewallNoRollback(const void *opaque ATTRIBUTE_UNUSED) +testFirewallNoRollback(const void *opaque G_GNUC_UNUSED) { virBuffer cmdbuf = VIR_BUFFER_INITIALIZER; virFirewallPtr fw = NULL; @@ -632,7 +632,7 @@ testFirewallNoRollback(const void *opaque ATTRIBUTE_UNUSED) } static int -testFirewallSingleRollback(const void *opaque ATTRIBUTE_UNUSED) +testFirewallSingleRollback(const void *opaque G_GNUC_UNUSED) { virBuffer cmdbuf = VIR_BUFFER_INITIALIZER; virFirewallPtr fw = NULL; @@ -719,7 +719,7 @@ testFirewallSingleRollback(const void *opaque ATTRIBUTE_UNUSED) } static int -testFirewallManyRollback(const void *opaque ATTRIBUTE_UNUSED) +testFirewallManyRollback(const void *opaque G_GNUC_UNUSED) { virBuffer cmdbuf = VIR_BUFFER_INITIALIZER; virFirewallPtr fw = NULL; @@ -809,7 +809,7 @@ testFirewallManyRollback(const void *opaque ATTRIBUTE_UNUSED) } static int -testFirewallChainedRollback(const void *opaque ATTRIBUTE_UNUSED) +testFirewallChainedRollback(const void *opaque G_GNUC_UNUSED) { virBuffer cmdbuf = VIR_BUFFER_INITIALIZER; virFirewallPtr fw = NULL; @@ -957,12 +957,12 @@ static bool expectedLineError; static void testFirewallQueryHook(const char *const*args, - const char *const*env ATTRIBUTE_UNUSED, - const char *input ATTRIBUTE_UNUSED, + const char *const*env G_GNUC_UNUSED, + const char *input G_GNUC_UNUSED, char **output, - char **error ATTRIBUTE_UNUSED, + char **error G_GNUC_UNUSED, int *status, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { if (STREQ(args[0], IPTABLES_PATH) && STREQ(args[1], "-L")) { @@ -982,7 +982,7 @@ static int testFirewallQueryCallback(virFirewallPtr fw, virFirewallLayer layer, const char *const *lines, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { size_t i; virFirewallAddRule(fw, layer, @@ -1008,7 +1008,7 @@ testFirewallQueryCallback(virFirewallPtr fw, } static int -testFirewallQuery(const void *opaque ATTRIBUTE_UNUSED) +testFirewallQuery(const void *opaque G_GNUC_UNUSED) { virBuffer cmdbuf = VIR_BUFFER_INITIALIZER; virFirewallPtr fw = NULL; diff --git a/tests/virhashtest.c b/tests/virhashtest.c index 2355e7bc63..1e9098e0e6 100644 --- a/tests/virhashtest.c +++ b/tests/virhashtest.c @@ -51,9 +51,9 @@ testHashInit(int size) } static int -testHashCheckForEachCount(void *payload ATTRIBUTE_UNUSED, - const void *name ATTRIBUTE_UNUSED, - void *data ATTRIBUTE_UNUSED) +testHashCheckForEachCount(void *payload G_GNUC_UNUSED, + const void *name G_GNUC_UNUSED, + void *data G_GNUC_UNUSED) { size_t *count = data; *count += 1; @@ -110,7 +110,7 @@ testHashGrow(const void *data) static int -testHashUpdate(const void *data ATTRIBUTE_UNUSED) +testHashUpdate(const void *data G_GNUC_UNUSED) { int count = ARRAY_CARDINALITY(uuids) + ARRAY_CARDINALITY(uuids_new); virHashTablePtr hash; @@ -148,7 +148,7 @@ testHashUpdate(const void *data ATTRIBUTE_UNUSED) static int -testHashRemove(const void *data ATTRIBUTE_UNUSED) +testHashRemove(const void *data G_GNUC_UNUSED) { int count = ARRAY_CARDINALITY(uuids) - ARRAY_CARDINALITY(uuids_subset); virHashTablePtr hash; @@ -181,7 +181,7 @@ const int testHashCountRemoveForEachSome = ARRAY_CARDINALITY(uuids) - ARRAY_CARDINALITY(uuids_subset); static int -testHashRemoveForEachSome(void *payload ATTRIBUTE_UNUSED, +testHashRemoveForEachSome(void *payload G_GNUC_UNUSED, const void *name, void *data) { @@ -204,7 +204,7 @@ testHashRemoveForEachSome(void *payload ATTRIBUTE_UNUSED, const int testHashCountRemoveForEachAll = 0; static int -testHashRemoveForEachAll(void *payload ATTRIBUTE_UNUSED, +testHashRemoveForEachAll(void *payload G_GNUC_UNUSED, const void *name, void *data) { @@ -242,7 +242,7 @@ testHashRemoveForEach(const void *data) static int -testHashSteal(const void *data ATTRIBUTE_UNUSED) +testHashSteal(const void *data G_GNUC_UNUSED) { int count = ARRAY_CARDINALITY(uuids) - ARRAY_CARDINALITY(uuids_subset); virHashTablePtr hash; @@ -272,7 +272,7 @@ testHashSteal(const void *data ATTRIBUTE_UNUSED) static int -testHashRemoveSetIter(const void *payload ATTRIBUTE_UNUSED, +testHashRemoveSetIter(const void *payload G_GNUC_UNUSED, const void *name, const void *data) { @@ -296,7 +296,7 @@ testHashRemoveSetIter(const void *payload ATTRIBUTE_UNUSED, } static int -testHashRemoveSet(const void *data ATTRIBUTE_UNUSED) +testHashRemoveSet(const void *data G_GNUC_UNUSED) { virHashTablePtr hash; int count = 0; @@ -332,15 +332,15 @@ testHashRemoveSet(const void *data ATTRIBUTE_UNUSED) const int testSearchIndex = ARRAY_CARDINALITY(uuids_subset) / 2; static int -testHashSearchIter(const void *payload ATTRIBUTE_UNUSED, +testHashSearchIter(const void *payload G_GNUC_UNUSED, const void *name, - const void *data ATTRIBUTE_UNUSED) + const void *data G_GNUC_UNUSED) { return STREQ(uuids_subset[testSearchIndex], name); } static int -testHashSearch(const void *data ATTRIBUTE_UNUSED) +testHashSearch(const void *data G_GNUC_UNUSED) { virHashTablePtr hash; void *entry; @@ -383,7 +383,7 @@ testHashGetItemsCompValue(const virHashKeyValuePair *a, } static int -testHashGetItems(const void *data ATTRIBUTE_UNUSED) +testHashGetItems(const void *data G_GNUC_UNUSED) { virHashTablePtr hash; virHashKeyValuePairPtr array = NULL; @@ -450,7 +450,7 @@ testHashEqualCompValue(const void *value1, const void *value2) } static int -testHashEqual(const void *data ATTRIBUTE_UNUSED) +testHashEqual(const void *data G_GNUC_UNUSED) { virHashTablePtr hash1, hash2 = NULL; int ret = -1; diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index 46627355c3..2cf2a6decf 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -390,7 +390,7 @@ testVirHostdevUpdateActivePCIHostdevs(void) * 2. Reattach devices to the host */ static int -testVirHostdevRoundtripNoGuest(const void *opaque ATTRIBUTE_UNUSED) +testVirHostdevRoundtripNoGuest(const void *opaque G_GNUC_UNUSED) { if (testVirHostdevDetachPCINodeDevice() < 0) return -1; @@ -412,7 +412,7 @@ testVirHostdevRoundtripNoGuest(const void *opaque ATTRIBUTE_UNUSED) * 4. Reattach devices to the host */ static int -testVirHostdevRoundtripUnmanaged(const void *opaque ATTRIBUTE_UNUSED) +testVirHostdevRoundtripUnmanaged(const void *opaque G_GNUC_UNUSED) { if (testVirHostdevDetachPCINodeDevice() < 0) return -1; @@ -436,7 +436,7 @@ testVirHostdevRoundtripUnmanaged(const void *opaque ATTRIBUTE_UNUSED) * 2. Detach devices from the guest as managed */ static int -testVirHostdevRoundtripManaged(const void *opaque ATTRIBUTE_UNUSED) +testVirHostdevRoundtripManaged(const void *opaque G_GNUC_UNUSED) { if (testVirHostdevPreparePCIHostdevs_managed(false) < 0) return -1; @@ -459,7 +459,7 @@ testVirHostdevRoundtripManaged(const void *opaque ATTRIBUTE_UNUSED) * 4. Reattach devices to the host */ static int -testVirHostdevRoundtripMixed(const void *opaque ATTRIBUTE_UNUSED) +testVirHostdevRoundtripMixed(const void *opaque G_GNUC_UNUSED) { if (testVirHostdevDetachPCINodeDevice() < 0) return -1; @@ -483,7 +483,7 @@ testVirHostdevRoundtripMixed(const void *opaque ATTRIBUTE_UNUSED) * 2. Update list of active devices */ static int -testVirHostdevOther(const void *opaque ATTRIBUTE_UNUSED) +testVirHostdevOther(const void *opaque G_GNUC_UNUSED) { if (testVirHostdevResetPCINodeDevice() < 0) return -1; diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c index 90e7247817..3f87af1c3b 100644 --- a/tests/viridentitytest.c +++ b/tests/viridentitytest.c @@ -36,7 +36,7 @@ VIR_LOG_INIT("tests.identitytest"); -static int testIdentityAttrs(const void *data ATTRIBUTE_UNUSED) +static int testIdentityAttrs(const void *data G_GNUC_UNUSED) { g_autoptr(virIdentity) ident = virIdentityNew(); const char *val; @@ -117,7 +117,7 @@ static int testIdentityGetSystem(const void *data) return 0; } -static int testSetFakeSELinuxContext(const void *data ATTRIBUTE_UNUSED) +static int testSetFakeSELinuxContext(const void *data G_GNUC_UNUSED) { #if WITH_SELINUX return setcon_raw((security_context_t)data); @@ -127,7 +127,7 @@ static int testSetFakeSELinuxContext(const void *data ATTRIBUTE_UNUSED) #endif } -static int testDisableFakeSELinux(const void *data ATTRIBUTE_UNUSED) +static int testDisableFakeSELinux(const void *data G_GNUC_UNUSED) { #if WITH_SELINUX return security_disable(); diff --git a/tests/viriscsitest.c b/tests/viriscsitest.c index 1ce039425b..6ebe404762 100644 --- a/tests/viriscsitest.c +++ b/tests/viriscsitest.c @@ -73,10 +73,10 @@ struct testIscsiadmCbData { }; static void testIscsiadmCb(const char *const*args, - const char *const*env ATTRIBUTE_UNUSED, - const char *input ATTRIBUTE_UNUSED, + const char *const*env G_GNUC_UNUSED, + const char *input G_GNUC_UNUSED, char **output, - char **error ATTRIBUTE_UNUSED, + char **error G_GNUC_UNUSED, int *status, void *opaque) { diff --git a/tests/virjsontest.c b/tests/virjsontest.c index 81da89a6b0..2fe0ea1fb6 100644 --- a/tests/virjsontest.c +++ b/tests/virjsontest.c @@ -385,7 +385,7 @@ testJSONDeflatten(const void *data) static int -testJSONEscapeObj(const void *data ATTRIBUTE_UNUSED) +testJSONEscapeObj(const void *data G_GNUC_UNUSED) { VIR_AUTOPTR(virJSONValue) json = NULL; VIR_AUTOPTR(virJSONValue) nestjson = NULL; @@ -437,7 +437,7 @@ testJSONEscapeObj(const void *data ATTRIBUTE_UNUSED) static int -testJSONObjectFormatSteal(const void *opaque ATTRIBUTE_UNUSED) +testJSONObjectFormatSteal(const void *opaque G_GNUC_UNUSED) { VIR_AUTOPTR(virJSONValue) a1 = NULL; VIR_AUTOPTR(virJSONValue) a2 = NULL; diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c index 963e9e0977..c2e756cdd0 100644 --- a/tests/virkeycodetest.c +++ b/tests/virkeycodetest.c @@ -33,7 +33,7 @@ VIR_LOG_INIT("tests.keycodetest"); -static int testKeycodeMapping(const void *data ATTRIBUTE_UNUSED) +static int testKeycodeMapping(const void *data G_GNUC_UNUSED) { int ret = -1; int got; @@ -66,7 +66,7 @@ static int testKeycodeMapping(const void *data ATTRIBUTE_UNUSED) } -static int testKeycodeStrings(const void *data ATTRIBUTE_UNUSED) +static int testKeycodeStrings(const void *data G_GNUC_UNUSED) { int ret = -1; int got; diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c index 4276149163..b1236a47e1 100644 --- a/tests/virkeyfiletest.c +++ b/tests/virkeyfiletest.c @@ -31,7 +31,7 @@ VIR_LOG_INIT("tests.keyfiletest"); -static int testParse(const void *args ATTRIBUTE_UNUSED) +static int testParse(const void *args G_GNUC_UNUSED) { static const char *cfg1 = "# Some config\n" diff --git a/tests/virkmodtest.c b/tests/virkmodtest.c index 80029244ff..853f4ea14e 100644 --- a/tests/virkmodtest.c +++ b/tests/virkmodtest.c @@ -36,7 +36,7 @@ struct testInfo { # define VIR_FROM_THIS VIR_FROM_NONE static int -testKModConfig(const void *args ATTRIBUTE_UNUSED) +testKModConfig(const void *args G_GNUC_UNUSED) { int ret = -1; char *outbuf = NULL; diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c index 991e587db6..57deb288a9 100644 --- a/tests/virlockspacetest.c +++ b/tests/virlockspacetest.c @@ -36,7 +36,7 @@ VIR_LOG_INIT("tests.lockspacetest"); #define LOCKSPACE_DIR abs_builddir "/virlockspacedata" -static int testLockSpaceCreate(const void *args ATTRIBUTE_UNUSED) +static int testLockSpaceCreate(const void *args G_GNUC_UNUSED) { virLockSpacePtr lockspace; int ret = -1; @@ -58,7 +58,7 @@ static int testLockSpaceCreate(const void *args ATTRIBUTE_UNUSED) } -static int testLockSpaceResourceLifecycle(const void *args ATTRIBUTE_UNUSED) +static int testLockSpaceResourceLifecycle(const void *args G_GNUC_UNUSED) { virLockSpacePtr lockspace; int ret = -1; @@ -92,7 +92,7 @@ static int testLockSpaceResourceLifecycle(const void *args ATTRIBUTE_UNUSED) } -static int testLockSpaceResourceLockExcl(const void *args ATTRIBUTE_UNUSED) +static int testLockSpaceResourceLockExcl(const void *args G_GNUC_UNUSED) { virLockSpacePtr lockspace; int ret = -1; @@ -138,7 +138,7 @@ static int testLockSpaceResourceLockExcl(const void *args ATTRIBUTE_UNUSED) } -static int testLockSpaceResourceLockExclAuto(const void *args ATTRIBUTE_UNUSED) +static int testLockSpaceResourceLockExclAuto(const void *args G_GNUC_UNUSED) { virLockSpacePtr lockspace; int ret = -1; @@ -176,7 +176,7 @@ static int testLockSpaceResourceLockExclAuto(const void *args ATTRIBUTE_UNUSED) } -static int testLockSpaceResourceLockShr(const void *args ATTRIBUTE_UNUSED) +static int testLockSpaceResourceLockShr(const void *args G_GNUC_UNUSED) { virLockSpacePtr lockspace; int ret = -1; @@ -230,7 +230,7 @@ static int testLockSpaceResourceLockShr(const void *args ATTRIBUTE_UNUSED) } -static int testLockSpaceResourceLockShrAuto(const void *args ATTRIBUTE_UNUSED) +static int testLockSpaceResourceLockShrAuto(const void *args G_GNUC_UNUSED) { virLockSpacePtr lockspace; int ret = -1; @@ -290,7 +290,7 @@ static int testLockSpaceResourceLockShrAuto(const void *args ATTRIBUTE_UNUSED) } -static int testLockSpaceResourceLockPath(const void *args ATTRIBUTE_UNUSED) +static int testLockSpaceResourceLockPath(const void *args G_GNUC_UNUSED) { virLockSpacePtr lockspace; int ret = -1; diff --git a/tests/virmock.h b/tests/virmock.h index 7520bb5d6e..95feeb0d92 100644 --- a/tests/virmock.h +++ b/tests/virmock.h @@ -34,7 +34,7 @@ #define VIR_MOCK_ARGNAME(a, b) b #define VIR_MOCK_ARGTYPE(a, b) a #define VIR_MOCK_ARGTYPENAME(a, b) a b -#define VIR_MOCK_ARGTYPENAME_UNUSED(a, b) a b ATTRIBUTE_UNUSED +#define VIR_MOCK_ARGTYPENAME_UNUSED(a, b) a b G_GNUC_UNUSED #define VIR_MOCK_GET_ARG2(z, a, b) z(a, b) #define VIR_MOCK_GET_ARG3(z, a, b, c) z(a, b) diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c index 255ef80642..f0e91763b8 100644 --- a/tests/virnetdaemontest.c +++ b/tests/virnetdaemontest.c @@ -31,8 +31,8 @@ struct testClientPriv { static void * -testClientNew(virNetServerClientPtr client ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +testClientNew(virNetServerClientPtr client G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { struct testClientPriv *priv; @@ -46,7 +46,7 @@ testClientNew(virNetServerClientPtr client ATTRIBUTE_UNUSED, static virJSONValuePtr -testClientPreExec(virNetServerClientPtr client ATTRIBUTE_UNUSED, +testClientPreExec(virNetServerClientPtr client G_GNUC_UNUSED, void *data) { struct testClientPriv *priv = data; @@ -237,7 +237,7 @@ struct testExecRestartData { }; static virNetServerPtr -testNewServerPostExecRestart(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, +testNewServerPostExecRestart(virNetDaemonPtr dmn G_GNUC_UNUSED, const char *name, virJSONValuePtr object, void *opaque) diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c index 2d81441626..3251df8873 100644 --- a/tests/virnetmessagetest.c +++ b/tests/virnetmessagetest.c @@ -31,7 +31,7 @@ VIR_LOG_INIT("tests.netmessagetest"); -static int testMessageHeaderEncode(const void *args ATTRIBUTE_UNUSED) +static int testMessageHeaderEncode(const void *args G_GNUC_UNUSED) { virNetMessagePtr msg = virNetMessageNew(true); static const char expect[] = { @@ -84,7 +84,7 @@ static int testMessageHeaderEncode(const void *args ATTRIBUTE_UNUSED) return ret; } -static int testMessageHeaderDecode(const void *args ATTRIBUTE_UNUSED) +static int testMessageHeaderDecode(const void *args G_GNUC_UNUSED) { virNetMessagePtr msg = virNetMessageNew(true); static char input_buf [] = { @@ -180,7 +180,7 @@ static int testMessageHeaderDecode(const void *args ATTRIBUTE_UNUSED) return ret; } -static int testMessagePayloadEncode(const void *args ATTRIBUTE_UNUSED) +static int testMessagePayloadEncode(const void *args G_GNUC_UNUSED) { virNetMessageError err; virNetMessagePtr msg = virNetMessageNew(true); @@ -288,7 +288,7 @@ static int testMessagePayloadEncode(const void *args ATTRIBUTE_UNUSED) return ret; } -static int testMessagePayloadDecode(const void *args ATTRIBUTE_UNUSED) +static int testMessagePayloadDecode(const void *args G_GNUC_UNUSED) { virNetMessageError err; virNetMessagePtr msg = virNetMessageNew(true); @@ -452,7 +452,7 @@ static int testMessagePayloadDecode(const void *args ATTRIBUTE_UNUSED) return ret; } -static int testMessagePayloadStreamEncode(const void *args ATTRIBUTE_UNUSED) +static int testMessagePayloadStreamEncode(const void *args G_GNUC_UNUSED) { char stream[] = "The quick brown fox jumps over the lazy dog"; virNetMessagePtr msg = virNetMessageNew(true); diff --git a/tests/virnetserverclientmock.c b/tests/virnetserverclientmock.c index 23418de911..d11c66af5d 100644 --- a/tests/virnetserverclientmock.c +++ b/tests/virnetserverclientmock.c @@ -22,15 +22,15 @@ #include "virutil.h" #include "internal.h" -int virEventAddTimeout(int frequency ATTRIBUTE_UNUSED, - virEventTimeoutCallback cb ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - virFreeCallback ff ATTRIBUTE_UNUSED) +int virEventAddTimeout(int frequency G_GNUC_UNUSED, + virEventTimeoutCallback cb G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED, + virFreeCallback ff G_GNUC_UNUSED) { return 0; } -int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED, +int virNetSocketGetUNIXIdentity(virNetSocketPtr sock G_GNUC_UNUSED, uid_t *uid, gid_t *gid, pid_t *pid, @@ -43,17 +43,17 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED, return 0; } -char *virGetUserName(uid_t uid ATTRIBUTE_UNUSED) +char *virGetUserName(uid_t uid G_GNUC_UNUSED) { return strdup("astrochicken"); } -char *virGetGroupName(gid_t gid ATTRIBUTE_UNUSED) +char *virGetGroupName(gid_t gid G_GNUC_UNUSED) { return strdup("fictionalusers"); } -int virNetSocketGetSELinuxContext(virNetSocketPtr sock ATTRIBUTE_UNUSED, +int virNetSocketGetSELinuxContext(virNetSocketPtr sock G_GNUC_UNUSED, char **context) { if (!(*context = strdup("foo_u:bar_r:wizz_t:s0-s0:c0.c1023"))) diff --git a/tests/virnetserverclienttest.c b/tests/virnetserverclienttest.c index 42393d7dbe..a9a56c48d5 100644 --- a/tests/virnetserverclienttest.c +++ b/tests/virnetserverclienttest.c @@ -27,8 +27,8 @@ #ifdef HAVE_SOCKETPAIR static void * -testClientNew(virNetServerClientPtr client ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +testClientNew(virNetServerClientPtr client G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { char *dummy; @@ -45,7 +45,7 @@ testClientFree(void *opaque) VIR_FREE(opaque); } -static int testIdentity(const void *opaque ATTRIBUTE_UNUSED) +static int testIdentity(const void *opaque G_GNUC_UNUSED) { int sv[2]; int ret = -1; diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 8cad351605..0934842252 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -154,7 +154,7 @@ testSocketClient(void *opaque) static void testSocketIncoming(virNetSocketPtr sock, - int events ATTRIBUTE_UNUSED, + int events G_GNUC_UNUSED, void *opaque) { virNetSocketPtr *retsock = opaque; @@ -305,7 +305,7 @@ testSocketAccept(const void *opaque) #ifndef WIN32 -static int testSocketUNIXAddrs(const void *data ATTRIBUTE_UNUSED) +static int testSocketUNIXAddrs(const void *data G_GNUC_UNUSED) { virNetSocketPtr lsock = NULL; /* Listen socket */ virNetSocketPtr ssock = NULL; /* Server socket */ @@ -393,7 +393,7 @@ static int testSocketUNIXAddrs(const void *data ATTRIBUTE_UNUSED) return ret; } -static int testSocketCommandNormal(const void *data ATTRIBUTE_UNUSED) +static int testSocketCommandNormal(const void *data G_GNUC_UNUSED) { virNetSocketPtr csock = NULL; /* Client socket */ char buf[100]; @@ -421,7 +421,7 @@ static int testSocketCommandNormal(const void *data ATTRIBUTE_UNUSED) return ret; } -static int testSocketCommandFail(const void *data ATTRIBUTE_UNUSED) +static int testSocketCommandFail(const void *data G_GNUC_UNUSED) { virNetSocketPtr csock = NULL; /* Client socket */ char buf[100]; diff --git a/tests/virnumamock.c b/tests/virnumamock.c index 475efc1f34..fe5e9b4940 100644 --- a/tests/virnumamock.c +++ b/tests/virnumamock.c @@ -108,7 +108,7 @@ virNumaGetNodeMemory(int node, } int -virNumaGetDistances(int node ATTRIBUTE_UNUSED, +virNumaGetDistances(int node G_GNUC_UNUSED, int **distances, int *ndistances) { diff --git a/tests/virpcimock.c b/tests/virpcimock.c index edb558b6ec..8f860bb917 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -909,7 +909,7 @@ pci_driver_handle_drivers_probe(const char *path) } static int -pci_driver_handle_change(int fd ATTRIBUTE_UNUSED, const char *path) +pci_driver_handle_change(int fd G_GNUC_UNUSED, const char *path) { int ret; const char *file = last_component(path); diff --git a/tests/virpcitest.c b/tests/virpcitest.c index 6f71c39d03..de96e6eb7e 100644 --- a/tests/virpcitest.c +++ b/tests/virpcitest.c @@ -55,7 +55,7 @@ testVirPCIDeviceCheckDriver(virPCIDevicePtr dev, const char *expected) } static int -testVirPCIDeviceNew(const void *opaque ATTRIBUTE_UNUSED) +testVirPCIDeviceNew(const void *opaque G_GNUC_UNUSED) { int ret = -1; virPCIDevicePtr dev; @@ -87,7 +87,7 @@ testVirPCIDeviceNew(const void *opaque ATTRIBUTE_UNUSED) } static int -testVirPCIDeviceDetach(const void *opaque ATTRIBUTE_UNUSED) +testVirPCIDeviceDetach(const void *opaque G_GNUC_UNUSED) { int ret = -1; virPCIDevicePtr dev[] = {NULL, NULL, NULL}; @@ -128,7 +128,7 @@ testVirPCIDeviceDetach(const void *opaque ATTRIBUTE_UNUSED) } static int -testVirPCIDeviceReset(const void *opaque ATTRIBUTE_UNUSED) +testVirPCIDeviceReset(const void *opaque G_GNUC_UNUSED) { int ret = -1; virPCIDevicePtr dev[] = {NULL, NULL, NULL}; @@ -163,7 +163,7 @@ testVirPCIDeviceReset(const void *opaque ATTRIBUTE_UNUSED) } static int -testVirPCIDeviceReattach(const void *opaque ATTRIBUTE_UNUSED) +testVirPCIDeviceReattach(const void *opaque G_GNUC_UNUSED) { int ret = -1; virPCIDevicePtr dev[] = {NULL, NULL, NULL}; diff --git a/tests/virpolkittest.c b/tests/virpolkittest.c index ce1ff92bf2..e80ccfedb7 100644 --- a/tests/virpolkittest.c +++ b/tests/virpolkittest.c @@ -143,7 +143,7 @@ VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_and_block, -static int testPolkitAuthSuccess(const void *opaque ATTRIBUTE_UNUSED) +static int testPolkitAuthSuccess(const void *opaque G_GNUC_UNUSED) { int ret = -1; @@ -162,7 +162,7 @@ static int testPolkitAuthSuccess(const void *opaque ATTRIBUTE_UNUSED) } -static int testPolkitAuthDenied(const void *opaque ATTRIBUTE_UNUSED) +static int testPolkitAuthDenied(const void *opaque G_GNUC_UNUSED) { int ret = -1; int rv; @@ -196,7 +196,7 @@ static int testPolkitAuthDenied(const void *opaque ATTRIBUTE_UNUSED) } -static int testPolkitAuthChallenge(const void *opaque ATTRIBUTE_UNUSED) +static int testPolkitAuthChallenge(const void *opaque G_GNUC_UNUSED) { int ret = -1; int rv; @@ -231,7 +231,7 @@ static int testPolkitAuthChallenge(const void *opaque ATTRIBUTE_UNUSED) } -static int testPolkitAuthCancelled(const void *opaque ATTRIBUTE_UNUSED) +static int testPolkitAuthCancelled(const void *opaque G_GNUC_UNUSED) { int ret = -1; int rv; @@ -265,7 +265,7 @@ static int testPolkitAuthCancelled(const void *opaque ATTRIBUTE_UNUSED) } -static int testPolkitAuthDetailsSuccess(const void *opaque ATTRIBUTE_UNUSED) +static int testPolkitAuthDetailsSuccess(const void *opaque G_GNUC_UNUSED) { int ret = -1; const char *details[] = { @@ -288,7 +288,7 @@ static int testPolkitAuthDetailsSuccess(const void *opaque ATTRIBUTE_UNUSED) } -static int testPolkitAuthDetailsDenied(const void *opaque ATTRIBUTE_UNUSED) +static int testPolkitAuthDetailsDenied(const void *opaque G_GNUC_UNUSED) { int ret = -1; int rv; diff --git a/tests/virportallocatormock.c b/tests/virportallocatormock.c index c0f8e8e857..e715f34e04 100644 --- a/tests/virportallocatormock.c +++ b/tests/virportallocatormock.c @@ -68,9 +68,9 @@ int socket(int domain, return realsocket(domain, type, protocol); } -int bind(int sockfd ATTRIBUTE_UNUSED, +int bind(int sockfd G_GNUC_UNUSED, const struct sockaddr *addr, - socklen_t addrlen ATTRIBUTE_UNUSED) + socklen_t addrlen G_GNUC_UNUSED) { struct sockaddr_in saddr; diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c index c695b26859..8e62fc4519 100644 --- a/tests/virportallocatortest.c +++ b/tests/virportallocatortest.c @@ -37,7 +37,7 @@ VIR_LOG_INIT("tests.portallocatortest"); -static int testAllocAll(const void *args ATTRIBUTE_UNUSED) +static int testAllocAll(const void *args G_GNUC_UNUSED) { virPortAllocatorRangePtr ports = virPortAllocatorRangeNew("test", 5900, 5909); int ret = -1; @@ -109,7 +109,7 @@ static int testAllocAll(const void *args ATTRIBUTE_UNUSED) -static int testAllocReuse(const void *args ATTRIBUTE_UNUSED) +static int testAllocReuse(const void *args G_GNUC_UNUSED) { virPortAllocatorRangePtr ports = virPortAllocatorRangeNew("test", 5900, 5910); int ret = -1; diff --git a/tests/virprocessmock.c b/tests/virprocessmock.c index 79af1e8064..c9386d757a 100644 --- a/tests/virprocessmock.c +++ b/tests/virprocessmock.c @@ -22,7 +22,7 @@ #include "virprocess.h" int -virProcessSetMaxMemLock(pid_t pid ATTRIBUTE_UNUSED, unsigned long long bytes ATTRIBUTE_UNUSED) +virProcessSetMaxMemLock(pid_t pid G_GNUC_UNUSED, unsigned long long bytes G_GNUC_UNUSED) { return 0; } diff --git a/tests/virrandommock.c b/tests/virrandommock.c index 3781b0f4ef..a74776efa3 100644 --- a/tests/virrandommock.c +++ b/tests/virrandommock.c @@ -51,7 +51,7 @@ uint64_t virRandomBits(int nbits) } int virRandomGenerateWWN(char **wwn, - const char *virt_type ATTRIBUTE_UNUSED) + const char *virt_type G_GNUC_UNUSED) { return virAsprintf(wwn, "5100000%09llx", (unsigned long long)virRandomBits(36)); diff --git a/tests/virrotatingfiletest.c b/tests/virrotatingfiletest.c index 0d81bbfd6a..3ccd9a8535 100644 --- a/tests/virrotatingfiletest.c +++ b/tests/virrotatingfiletest.c @@ -161,7 +161,7 @@ static int testRotatingFileInitFiles(off_t baseSize, return 0; } -static int testRotatingFileWriterNew(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileWriterNew(const void *data G_GNUC_UNUSED) { virRotatingFileWriterPtr file; int ret = -1; @@ -204,7 +204,7 @@ static int testRotatingFileWriterNew(const void *data ATTRIBUTE_UNUSED) } -static int testRotatingFileWriterAppend(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileWriterAppend(const void *data G_GNUC_UNUSED) { virRotatingFileWriterPtr file; int ret = -1; @@ -247,7 +247,7 @@ static int testRotatingFileWriterAppend(const void *data ATTRIBUTE_UNUSED) } -static int testRotatingFileWriterTruncate(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileWriterTruncate(const void *data G_GNUC_UNUSED) { virRotatingFileWriterPtr file; int ret = -1; @@ -290,7 +290,7 @@ static int testRotatingFileWriterTruncate(const void *data ATTRIBUTE_UNUSED) } -static int testRotatingFileWriterRolloverNone(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileWriterRolloverNone(const void *data G_GNUC_UNUSED) { virRotatingFileWriterPtr file; int ret = -1; @@ -333,7 +333,7 @@ static int testRotatingFileWriterRolloverNone(const void *data ATTRIBUTE_UNUSED) } -static int testRotatingFileWriterRolloverOne(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileWriterRolloverOne(const void *data G_GNUC_UNUSED) { virRotatingFileWriterPtr file; int ret = -1; @@ -378,7 +378,7 @@ static int testRotatingFileWriterRolloverOne(const void *data ATTRIBUTE_UNUSED) } -static int testRotatingFileWriterRolloverAppend(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileWriterRolloverAppend(const void *data G_GNUC_UNUSED) { virRotatingFileWriterPtr file; int ret = -1; @@ -421,7 +421,7 @@ static int testRotatingFileWriterRolloverAppend(const void *data ATTRIBUTE_UNUSE } -static int testRotatingFileWriterRolloverMany(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileWriterRolloverMany(const void *data G_GNUC_UNUSED) { virRotatingFileWriterPtr file; int ret = -1; @@ -470,7 +470,7 @@ static int testRotatingFileWriterRolloverMany(const void *data ATTRIBUTE_UNUSED) } -static int testRotatingFileWriterRolloverLineBreak(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileWriterRolloverLineBreak(const void *data G_GNUC_UNUSED) { virRotatingFileWriterPtr file; int ret = -1; @@ -512,7 +512,7 @@ static int testRotatingFileWriterRolloverLineBreak(const void *data ATTRIBUTE_UN } -static int testRotatingFileWriterLargeFile(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileWriterLargeFile(const void *data G_GNUC_UNUSED) { virRotatingFileWriterPtr file; int ret = -1; @@ -554,7 +554,7 @@ static int testRotatingFileWriterLargeFile(const void *data ATTRIBUTE_UNUSED) } -static int testRotatingFileReaderOne(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileReaderOne(const void *data G_GNUC_UNUSED) { virRotatingFileReaderPtr file; int ret = -1; @@ -586,7 +586,7 @@ static int testRotatingFileReaderOne(const void *data ATTRIBUTE_UNUSED) return ret; } -static int testRotatingFileReaderAll(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileReaderAll(const void *data G_GNUC_UNUSED) { virRotatingFileReaderPtr file; int ret = -1; @@ -618,7 +618,7 @@ static int testRotatingFileReaderAll(const void *data ATTRIBUTE_UNUSED) return ret; } -static int testRotatingFileReaderPartial(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileReaderPartial(const void *data G_GNUC_UNUSED) { virRotatingFileReaderPtr file; int ret = -1; @@ -650,7 +650,7 @@ static int testRotatingFileReaderPartial(const void *data ATTRIBUTE_UNUSED) return ret; } -static int testRotatingFileReaderSeek(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileReaderSeek(const void *data G_GNUC_UNUSED) { virRotatingFileReaderPtr file; int ret = -1; diff --git a/tests/virscsitest.c b/tests/virscsitest.c index be3ef6234e..d4019e82f7 100644 --- a/tests/virscsitest.c +++ b/tests/virscsitest.c @@ -33,7 +33,7 @@ VIR_LOG_INIT("tests.scsitest"); static char *virscsi_prefix; static int -test1(const void *data ATTRIBUTE_UNUSED) +test1(const void *data G_GNUC_UNUSED) { char *name = NULL; int ret = -1; @@ -57,7 +57,7 @@ test1(const void *data ATTRIBUTE_UNUSED) * details. */ static int -test2(const void *data ATTRIBUTE_UNUSED) +test2(const void *data G_GNUC_UNUSED) { virSCSIDeviceListPtr list = NULL; virSCSIDevicePtr dev = NULL; diff --git a/tests/virshtest.c b/tests/virshtest.c index 673c13fe07..fee6833c9b 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -92,7 +92,7 @@ static char *custom_uri; "--connect", \ custom_uri -static int testCompareListDefault(const void *data ATTRIBUTE_UNUSED) +static int testCompareListDefault(const void *data G_GNUC_UNUSED) { const char *const argv[] = { VIRSH_DEFAULT, "list", NULL }; const char *exp = "\ @@ -103,7 +103,7 @@ static int testCompareListDefault(const void *data ATTRIBUTE_UNUSED) return testCompareOutputLit(exp, NULL, argv); } -static int testCompareListCustom(const void *data ATTRIBUTE_UNUSED) +static int testCompareListCustom(const void *data G_GNUC_UNUSED) { const char *const argv[] = { VIRSH_CUSTOM, "list", NULL }; const char *exp = "\ @@ -115,7 +115,7 @@ static int testCompareListCustom(const void *data ATTRIBUTE_UNUSED) return testCompareOutputLit(exp, NULL, argv); } -static int testCompareNodeinfoDefault(const void *data ATTRIBUTE_UNUSED) +static int testCompareNodeinfoDefault(const void *data G_GNUC_UNUSED) { const char *const argv[] = { VIRSH_DEFAULT, "nodeinfo", NULL }; const char *exp = "\ @@ -131,7 +131,7 @@ Memory size: 3145728 KiB\n\ return testCompareOutputLit(exp, NULL, argv); } -static int testCompareNodeinfoCustom(const void *data ATTRIBUTE_UNUSED) +static int testCompareNodeinfoCustom(const void *data G_GNUC_UNUSED) { const char *const argv[] = { VIRSH_CUSTOM, @@ -151,84 +151,84 @@ Memory size: 8192000 KiB\n\ return testCompareOutputLit(exp, NULL, argv); } -static int testCompareDominfoByID(const void *data ATTRIBUTE_UNUSED) +static int testCompareDominfoByID(const void *data G_GNUC_UNUSED) { const char *const argv[] = { VIRSH_CUSTOM, "dominfo", "2", NULL }; const char *exp = dominfo_fc4; return testCompareOutputLit(exp, "\nCPU time:", argv); } -static int testCompareDominfoByUUID(const void *data ATTRIBUTE_UNUSED) +static int testCompareDominfoByUUID(const void *data G_GNUC_UNUSED) { const char *const argv[] = { VIRSH_CUSTOM, "dominfo", DOM_UUID, NULL }; const char *exp = dominfo_fc4; return testCompareOutputLit(exp, "\nCPU time:", argv); } -static int testCompareDominfoByName(const void *data ATTRIBUTE_UNUSED) +static int testCompareDominfoByName(const void *data G_GNUC_UNUSED) { const char *const argv[] = { VIRSH_CUSTOM, "dominfo", "fc4", NULL }; const char *exp = dominfo_fc4; return testCompareOutputLit(exp, "\nCPU time:", argv); } -static int testCompareDomuuidByID(const void *data ATTRIBUTE_UNUSED) +static int testCompareDomuuidByID(const void *data G_GNUC_UNUSED) { const char *const argv[] = { VIRSH_CUSTOM, "domuuid", "2", NULL }; const char *exp = domuuid_fc4; return testCompareOutputLit(exp, NULL, argv); } -static int testCompareDomuuidByName(const void *data ATTRIBUTE_UNUSED) +static int testCompareDomuuidByName(const void *data G_GNUC_UNUSED) { const char *const argv[] = { VIRSH_CUSTOM, "domuuid", "fc4", NULL }; const char *exp = domuuid_fc4; return testCompareOutputLit(exp, NULL, argv); } -static int testCompareDomidByName(const void *data ATTRIBUTE_UNUSED) +static int testCompareDomidByName(const void *data G_GNUC_UNUSED) { const char *const argv[] = { VIRSH_CUSTOM, "domid", "fc4", NULL }; const char *exp = domid_fc4; return testCompareOutputLit(exp, NULL, argv); } -static int testCompareDomidByUUID(const void *data ATTRIBUTE_UNUSED) +static int testCompareDomidByUUID(const void *data G_GNUC_UNUSED) { const char *const argv[] = { VIRSH_CUSTOM, "domid", DOM_UUID, NULL }; const char *exp = domid_fc4; return testCompareOutputLit(exp, NULL, argv); } -static int testCompareDomnameByID(const void *data ATTRIBUTE_UNUSED) +static int testCompareDomnameByID(const void *data G_GNUC_UNUSED) { const char *const argv[] = { VIRSH_CUSTOM, "domname", "2", NULL }; const char *exp = domname_fc4; return testCompareOutputLit(exp, NULL, argv); } -static int testCompareDomnameByUUID(const void *data ATTRIBUTE_UNUSED) +static int testCompareDomnameByUUID(const void *data G_GNUC_UNUSED) { const char *const argv[] = { VIRSH_CUSTOM, "domname", DOM_UUID, NULL }; const char *exp = domname_fc4; return testCompareOutputLit(exp, NULL, argv); } -static int testCompareDomstateByID(const void *data ATTRIBUTE_UNUSED) +static int testCompareDomstateByID(const void *data G_GNUC_UNUSED) { const char *const argv[] = { VIRSH_CUSTOM, "domstate", "2", NULL }; const char *exp = domstate_fc4; return testCompareOutputLit(exp, NULL, argv); } -static int testCompareDomstateByUUID(const void *data ATTRIBUTE_UNUSED) +static int testCompareDomstateByUUID(const void *data G_GNUC_UNUSED) { const char *const argv[] = { VIRSH_CUSTOM, "domstate", DOM_UUID, NULL }; const char *exp = domstate_fc4; return testCompareOutputLit(exp, NULL, argv); } -static int testCompareDomstateByName(const void *data ATTRIBUTE_UNUSED) +static int testCompareDomstateByName(const void *data G_GNUC_UNUSED) { const char *const argv[] = { VIRSH_CUSTOM, "domstate", "fc4", NULL }; const char *exp = domstate_fc4; diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 8ebad89da7..77e8e0e404 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -472,7 +472,7 @@ static const char *testPathCanonicalizeSymlinks[][2] = static int testPathCanonicalizeReadlink(const char *path, char **linkpath, - void *data ATTRIBUTE_UNUSED) + void *data G_GNUC_UNUSED) { size_t i; diff --git a/tests/virstringtest.c b/tests/virstringtest.c index cbbfaa259d..12dab85ab8 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -261,7 +261,7 @@ testStrdupLookup2(size_t i) } static int -testStrdup(const void *data ATTRIBUTE_UNUSED) +testStrdup(const void *data G_GNUC_UNUSED) { char *array[] = { NULL, NULL }; size_t i = 0; @@ -331,7 +331,7 @@ testStrdup(const void *data ATTRIBUTE_UNUSED) } static int -testStrndupNegative(const void *opaque ATTRIBUTE_UNUSED) +testStrndupNegative(const void *opaque G_GNUC_UNUSED) { int ret = -1; char *dst; @@ -367,7 +367,7 @@ testStrndupNegative(const void *opaque ATTRIBUTE_UNUSED) static int -testStringSortCompare(const void *opaque ATTRIBUTE_UNUSED) +testStringSortCompare(const void *opaque G_GNUC_UNUSED) { const char *randlist[] = { "tasty", "astro", "goat", "chicken", "turducken", @@ -513,7 +513,7 @@ struct stringReplaceData { }; static int -testStringReplace(const void *opaque ATTRIBUTE_UNUSED) +testStringReplace(const void *opaque G_GNUC_UNUSED) { const struct stringReplaceData *data = opaque; char *result; @@ -690,7 +690,7 @@ testStringToDouble(const void *opaque) /* The point of this test is to check whether all members of the array are * freed. The test has to be checked using valgrind. */ static int -testVirStringListFreeCount(const void *opaque ATTRIBUTE_UNUSED) +testVirStringListFreeCount(const void *opaque G_GNUC_UNUSED) { char **list; diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index d33a7c192f..0a97443779 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -160,7 +160,7 @@ VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_and_block, } -static int testCreateContainer(const void *opaque ATTRIBUTE_UNUSED) +static int testCreateContainer(const void *opaque G_GNUC_UNUSED) { unsigned char uuid[VIR_UUID_BUFLEN] = { 1, 1, 1, 1, @@ -183,7 +183,7 @@ static int testCreateContainer(const void *opaque ATTRIBUTE_UNUSED) return 0; } -static int testTerminateContainer(const void *opaque ATTRIBUTE_UNUSED) +static int testTerminateContainer(const void *opaque G_GNUC_UNUSED) { if (virSystemdTerminateMachine("lxc-demo") < 0) { fprintf(stderr, "%s", "Failed to terminate LXC machine\n"); @@ -193,7 +193,7 @@ static int testTerminateContainer(const void *opaque ATTRIBUTE_UNUSED) return 0; } -static int testCreateMachine(const void *opaque ATTRIBUTE_UNUSED) +static int testCreateMachine(const void *opaque G_GNUC_UNUSED) { unsigned char uuid[VIR_UUID_BUFLEN] = { 1, 1, 1, 1, @@ -216,7 +216,7 @@ static int testCreateMachine(const void *opaque ATTRIBUTE_UNUSED) return 0; } -static int testTerminateMachine(const void *opaque ATTRIBUTE_UNUSED) +static int testTerminateMachine(const void *opaque G_GNUC_UNUSED) { if (virSystemdTerminateMachine("test-qemu-demo") < 0) { fprintf(stderr, "%s", "Failed to terminate KVM machine\n"); @@ -226,7 +226,7 @@ static int testTerminateMachine(const void *opaque ATTRIBUTE_UNUSED) return 0; } -static int testCreateNoSystemd(const void *opaque ATTRIBUTE_UNUSED) +static int testCreateNoSystemd(const void *opaque G_GNUC_UNUSED) { unsigned char uuid[VIR_UUID_BUFLEN] = { 1, 1, 1, 1, @@ -260,7 +260,7 @@ static int testCreateNoSystemd(const void *opaque ATTRIBUTE_UNUSED) return 0; } -static int testCreateSystemdNotRunning(const void *opaque ATTRIBUTE_UNUSED) +static int testCreateSystemdNotRunning(const void *opaque G_GNUC_UNUSED) { unsigned char uuid[VIR_UUID_BUFLEN] = { 1, 1, 1, 1, @@ -294,7 +294,7 @@ static int testCreateSystemdNotRunning(const void *opaque ATTRIBUTE_UNUSED) return 0; } -static int testCreateBadSystemd(const void *opaque ATTRIBUTE_UNUSED) +static int testCreateBadSystemd(const void *opaque G_GNUC_UNUSED) { unsigned char uuid[VIR_UUID_BUFLEN] = { 1, 1, 1, 1, @@ -329,7 +329,7 @@ static int testCreateBadSystemd(const void *opaque ATTRIBUTE_UNUSED) } -static int testCreateNetwork(const void *opaque ATTRIBUTE_UNUSED) +static int testCreateNetwork(const void *opaque G_GNUC_UNUSED) { unsigned char uuid[VIR_UUID_BUFLEN] = { 1, 1, 1, 1, @@ -358,7 +358,7 @@ static int testCreateNetwork(const void *opaque ATTRIBUTE_UNUSED) static int -testGetMachineName(const void *opaque ATTRIBUTE_UNUSED) +testGetMachineName(const void *opaque G_GNUC_UNUSED) { char *tmp = virSystemdGetMachineNameByPID(1234); int ret = -1; @@ -639,7 +639,7 @@ testActivation(bool useNames) static int -testActivationEmpty(const void *opaque ATTRIBUTE_UNUSED) +testActivationEmpty(const void *opaque G_GNUC_UNUSED) { virSystemdActivationPtr act; @@ -659,14 +659,14 @@ testActivationEmpty(const void *opaque ATTRIBUTE_UNUSED) static int -testActivationFDNames(const void *opaque ATTRIBUTE_UNUSED) +testActivationFDNames(const void *opaque G_GNUC_UNUSED) { return testActivation(true); } static int -testActivationFDAddrs(const void *opaque ATTRIBUTE_UNUSED) +testActivationFDAddrs(const void *opaque G_GNUC_UNUSED) { return testActivation(false); } diff --git a/tests/virtestmock.c b/tests/virtestmock.c index fa52667a2b..daae8ef41b 100644 --- a/tests/virtestmock.c +++ b/tests/virtestmock.c @@ -198,7 +198,7 @@ int access(const char *path, int mode) #include "virmockstathelpers.c" -static int virMockStatRedirect(const char *path ATTRIBUTE_UNUSED, char **newpath ATTRIBUTE_UNUSED) +static int virMockStatRedirect(const char *path G_GNUC_UNUSED, char **newpath G_GNUC_UNUSED) { return 0; } diff --git a/tests/virtypedparamtest.c b/tests/virtypedparamtest.c index ec389c65aa..9714a0a4c6 100644 --- a/tests/virtypedparamtest.c +++ b/tests/virtypedparamtest.c @@ -81,7 +81,7 @@ testTypedParamsValidate(const void *opaque) .nparams = PARAMS_SIZE(__VA_ARGS__), static int -testTypedParamsFilter(const void *opaque ATTRIBUTE_UNUSED) +testTypedParamsFilter(const void *opaque G_GNUC_UNUSED) { size_t i, nfiltered; int rv = -1; @@ -126,7 +126,7 @@ testTypedParamsFilter(const void *opaque ATTRIBUTE_UNUSED) } static int -testTypedParamsAddStringList(const void *opaque ATTRIBUTE_UNUSED) +testTypedParamsAddStringList(const void *opaque G_GNUC_UNUSED) { int rv = 0; virTypedParameterPtr params = NULL; @@ -151,7 +151,7 @@ testTypedParamsAddStringList(const void *opaque ATTRIBUTE_UNUSED) } static int -testTypedParamsGetStringList(const void *opaque ATTRIBUTE_UNUSED) +testTypedParamsGetStringList(const void *opaque G_GNUC_UNUSED) { size_t i; int picked; diff --git a/tests/virusbtest.c b/tests/virusbtest.c index 1f04f283f5..b26173248b 100644 --- a/tests/virusbtest.c +++ b/tests/virusbtest.c @@ -47,7 +47,7 @@ struct findTestInfo { static int testDeviceFileActor(virUSBDevicePtr dev, const char *path, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { char *str = NULL; int ret = 0; @@ -147,7 +147,7 @@ testCheckNdevs(const char* occasion, static int -testUSBList(const void *opaque ATTRIBUTE_UNUSED) +testUSBList(const void *opaque G_GNUC_UNUSED) { virUSBDeviceListPtr list = NULL; virUSBDeviceListPtr devlist = NULL; diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index d7d03f1753..b2c56a15fe 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -131,7 +131,7 @@ testCompareHelper(const void *data) } static char * -testParseVMXFileName(const char *fileName, void *opaque ATTRIBUTE_UNUSED) +testParseVMXFileName(const char *fileName, void *opaque G_GNUC_UNUSED) { char *copyOfFileName = NULL; char *tmp = NULL; diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c index b07db3cf23..f2e0554f0a 100644 --- a/tests/vshtabletest.c +++ b/tests/vshtabletest.c @@ -27,7 +27,7 @@ #include "../tools/vsh-table.h" static int -testVshTableNew(const void *opaque ATTRIBUTE_UNUSED) +testVshTableNew(const void *opaque G_GNUC_UNUSED) { if (vshTableNew(NULL)) { fprintf(stderr, "expected failure when passing null to vshTableNew\n"); @@ -38,7 +38,7 @@ testVshTableNew(const void *opaque ATTRIBUTE_UNUSED) } static int -testVshTableHeader(const void *opaque ATTRIBUTE_UNUSED) +testVshTableHeader(const void *opaque G_GNUC_UNUSED) { int ret = 0; char *act = NULL; @@ -76,7 +76,7 @@ testVshTableHeader(const void *opaque ATTRIBUTE_UNUSED) } static int -testVshTableRowAppend(const void *opaque ATTRIBUTE_UNUSED) +testVshTableRowAppend(const void *opaque G_GNUC_UNUSED) { int ret = 0; @@ -112,7 +112,7 @@ testVshTableRowAppend(const void *opaque ATTRIBUTE_UNUSED) } static int -testUnicode(const void *opaque ATTRIBUTE_UNUSED) +testUnicode(const void *opaque G_GNUC_UNUSED) { int ret = 0; char *act = NULL; @@ -144,7 +144,7 @@ testUnicode(const void *opaque ATTRIBUTE_UNUSED) /* Point of this test is to see how table behaves with right to left writing*/ static int -testUnicodeArabic(const void *opaque ATTRIBUTE_UNUSED) +testUnicodeArabic(const void *opaque G_GNUC_UNUSED) { int ret = 0; char *act = NULL; @@ -187,7 +187,7 @@ testUnicodeArabic(const void *opaque ATTRIBUTE_UNUSED) /* Testing zero-width characters by inserting few zero-width spaces */ static int -testUnicodeZeroWidthChar(const void *opaque ATTRIBUTE_UNUSED) +testUnicodeZeroWidthChar(const void *opaque G_GNUC_UNUSED) { int ret = 0; vshTablePtr table = NULL; @@ -224,7 +224,7 @@ testUnicodeZeroWidthChar(const void *opaque ATTRIBUTE_UNUSED) } static int -testUnicodeCombiningChar(const void *opaque ATTRIBUTE_UNUSED) +testUnicodeCombiningChar(const void *opaque G_GNUC_UNUSED) { int ret = 0; vshTablePtr table = NULL; @@ -253,7 +253,7 @@ testUnicodeCombiningChar(const void *opaque ATTRIBUTE_UNUSED) /* Testing zero-width characters by inserting few zero-width spaces */ static int -testUnicodeNonPrintableChar(const void *opaque ATTRIBUTE_UNUSED) +testUnicodeNonPrintableChar(const void *opaque G_GNUC_UNUSED) { int ret = 0; vshTablePtr table = NULL; @@ -281,7 +281,7 @@ testUnicodeNonPrintableChar(const void *opaque ATTRIBUTE_UNUSED) } static int -testNTables(const void *opaque ATTRIBUTE_UNUSED) +testNTables(const void *opaque G_GNUC_UNUSED) { int ret = 0; vshTablePtr table1 = NULL; diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index 5d5dc0a518..2078f5c7cf 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -132,8 +132,8 @@ testCompareHelper(const void *data) } static int -testAutodetectSCSIControllerModel(virDomainDiskDefPtr def ATTRIBUTE_UNUSED, - int *model, void *opaque ATTRIBUTE_UNUSED) +testAutodetectSCSIControllerModel(virDomainDiskDefPtr def G_GNUC_UNUSED, + int *model, void *opaque G_GNUC_UNUSED) { *model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC; @@ -141,7 +141,7 @@ testAutodetectSCSIControllerModel(virDomainDiskDefPtr def ATTRIBUTE_UNUSED, } static char * -testFormatVMXFileName(const char *src, void *opaque ATTRIBUTE_UNUSED) +testFormatVMXFileName(const char *src, void *opaque G_GNUC_UNUSED) { bool success = false; char *copyOfDatastorePath = NULL; -- 2.19.2

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- 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

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/vz/vz_driver.c | 60 +++++++++++++++++++++++----------------------- src/vz/vz_sdk.c | 8 +++---- src/vz/vz_utils.c | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index eb3fcf1fcc..c5fe59376e 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -243,10 +243,10 @@ vzDomainDefAddDefaultInputDevices(virDomainDefPtr def) static int vzDomainDefPostParse(virDomainDefPtr def, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) + virCapsPtr caps G_GNUC_UNUSED, + unsigned int parseFlags G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED, + void *parseOpaque G_GNUC_UNUSED) { if (vzDomainDefAddDefaultInputDevices(def) < 0) return -1; @@ -256,7 +256,7 @@ vzDomainDefPostParse(virDomainDefPtr def, static int vzDomainDefValidate(const virDomainDef *def, - virCapsPtr caps ATTRIBUTE_UNUSED, + virCapsPtr caps G_GNUC_UNUSED, void *opaque) { if (vzCheckUnsupportedControllers(def, opaque) < 0) @@ -268,10 +268,10 @@ vzDomainDefValidate(const virDomainDef *def, static int vzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, const virDomainDef *def, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) + virCapsPtr caps G_GNUC_UNUSED, + unsigned int parseFlags G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED, + void *parseOpaque G_GNUC_UNUSED) { if (dev->type == VIR_DOMAIN_DEVICE_NET && (dev->data.net->type == VIR_DOMAIN_NET_TYPE_NETWORK || @@ -286,7 +286,7 @@ vzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, static int vzDomainDeviceDefValidate(const virDomainDeviceDef *dev, const virDomainDef *def, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { if (dev->type == VIR_DOMAIN_DEVICE_DISK) return vzCheckUnsupportedDisk(def, dev->data.disk, opaque); @@ -346,8 +346,8 @@ vzDriverObjNew(void) static virDrvOpenStatus vzConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { vzDriverPtr driver = NULL; @@ -898,19 +898,19 @@ vzNodeGetInfo(virConnectPtr conn, return virCapabilitiesGetNodeInfo(nodeinfo); } -static int vzConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int vzConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* Encryption is not relevant / applicable to way we talk to PCS */ return 0; } -static int vzConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int vzConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* We run CLI tools directly so this is secure */ return 1; } -static int vzConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int vzConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } @@ -2967,8 +2967,8 @@ static int vzDomainMigratePrepare3Params(virConnectPtr conn, virTypedParameterPtr params, int nparams, - const char *cookiein ATTRIBUTE_UNUSED, - int cookieinlen ATTRIBUTE_UNUSED, + const char *cookiein G_GNUC_UNUSED, + int cookieinlen G_GNUC_UNUSED, char **cookieout, int *cookieoutlen, char **uri_out, @@ -3030,7 +3030,7 @@ vzDomainMigratePrepare3Params(virConnectPtr conn, } static int -vzConnectSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feature) +vzConnectSupportsFeature(virConnectPtr conn G_GNUC_UNUSED, int feature) { if (virConnectSupportsFeatureEnsureACL(conn) < 0) return -1; @@ -3262,8 +3262,8 @@ vzDomainMigratePerform3Params(virDomainPtr domain, int nparams, const char *cookiein, int cookieinlen, - char **cookieout ATTRIBUTE_UNUSED, - int *cookieoutlen ATTRIBUTE_UNUSED, + char **cookieout G_GNUC_UNUSED, + int *cookieoutlen G_GNUC_UNUSED, unsigned int flags) { int ret = -1; @@ -3298,10 +3298,10 @@ static virDomainPtr vzDomainMigrateFinish3Params(virConnectPtr dconn, virTypedParameterPtr params, int nparams, - const char *cookiein ATTRIBUTE_UNUSED, - int cookieinlen ATTRIBUTE_UNUSED, - char **cookieout ATTRIBUTE_UNUSED, - int *cookieoutlen ATTRIBUTE_UNUSED, + const char *cookiein G_GNUC_UNUSED, + int cookieinlen G_GNUC_UNUSED, + char **cookieout G_GNUC_UNUSED, + int *cookieoutlen G_GNUC_UNUSED, unsigned int flags, int cancelled) { @@ -3344,13 +3344,13 @@ vzDomainMigrateFinish3Params(virConnectPtr dconn, } static int -vzDomainMigrateConfirm3Params(virDomainPtr domain ATTRIBUTE_UNUSED, +vzDomainMigrateConfirm3Params(virDomainPtr domain G_GNUC_UNUSED, virTypedParameterPtr params, int nparams, - const char *cookiein ATTRIBUTE_UNUSED, - int cookieinlen ATTRIBUTE_UNUSED, + const char *cookiein G_GNUC_UNUSED, + int cookieinlen G_GNUC_UNUSED, unsigned int flags, - int cancelled ATTRIBUTE_UNUSED) + int cancelled G_GNUC_UNUSED) { virCheckFlags(VZ_MIGRATION_FLAGS, -1); @@ -4114,8 +4114,8 @@ vzStateCleanup(void) static int vzStateInitialize(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + virStateInhibitCallback callback G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { if (!privileged) return VIR_DRV_STATE_INIT_SKIPPED; diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 7ac4888ecb..cef840fb9f 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -3083,7 +3083,7 @@ static int prlsdkApplyGraphicsParams(PRL_HANDLE sdkdom, return ret; } -static int prlsdkApplyVideoParams(PRL_HANDLE sdkdom ATTRIBUTE_UNUSED, virDomainDefPtr def) +static int prlsdkApplyVideoParams(PRL_HANDLE sdkdom G_GNUC_UNUSED, virDomainDefPtr def) { PRL_RESULT pret; @@ -3283,8 +3283,8 @@ static int prlsdkConfigureGateways(PRL_HANDLE sdknet, virDomainNetDefPtr net) return ret; } -static int prlsdkConfigureNet(vzDriverPtr driver ATTRIBUTE_UNUSED, - virDomainObjPtr dom ATTRIBUTE_UNUSED, +static int prlsdkConfigureNet(vzDriverPtr driver G_GNUC_UNUSED, + virDomainObjPtr dom G_GNUC_UNUSED, PRL_HANDLE sdkdom, virDomainNetDefPtr net, bool isCt, bool create) @@ -3665,7 +3665,7 @@ prlsdkAttachDevice(vzDriverPtr driver, } int -prlsdkDetachDevice(vzDriverPtr driver ATTRIBUTE_UNUSED, +prlsdkDetachDevice(vzDriverPtr driver G_GNUC_UNUSED, virDomainObjPtr dom, virDomainDeviceDefPtr dev) { diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index 13f5deeaa5..001c3e96af 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -551,7 +551,7 @@ int vzCheckUnsupportedGraphics(virDomainGraphicsDefPtr gr) } void* -vzDomObjAlloc(void *opaque ATTRIBUTE_UNUSED) +vzDomObjAlloc(void *opaque G_GNUC_UNUSED) { vzDomObjPtr pdom = NULL; -- 2.19.2

Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- build-aux/syntax-check.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index f4712c24c3..c220dadd6c 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -370,7 +370,7 @@ sc_flags_usage: | $(GREP) -c '\(long\|unsigned\) flags')" != 4 && \ { echo '$(ME): new API should use "unsigned int flags"' 1>&2; \ exit 1; } || : - @prohibit=' flags ATTRIBUTE_UNUSED' \ + @prohibit=' flags G_GNUC_UNUSED' \ exclude='virSecurityDomainImageLabelFlags' \ halt='flags should be checked with virCheckFlags' \ $(_sc_search_regexp) @@ -620,12 +620,12 @@ sc_prohibit_return_as_function: halt='avoid extra () with return statements' \ $(_sc_search_regexp) -# ATTRIBUTE_UNUSED should only be applied in implementations, not +# G_GNUC_UNUSED should only be applied in implementations, not # header declarations -sc_avoid_attribute_unused_in_header: - @prohibit='^[^#]*ATTRIBUTE_UNUSED([^:]|$$)' \ +sc_avoid_g_gnuc_unused_in_header: + @prohibit='^[^#]*G_GNUC_UNUSED([^:]|$$)' \ in_vc_files='\.h$$' \ - halt='use ATTRIBUTE_UNUSED in .c rather than .h files' \ + halt='use G_GNUC_UNUSED in .c rather than .h files' \ $(_sc_search_regexp) sc_prohibit_int_index: @@ -2295,7 +2295,7 @@ exclude_file_name_regexp--sc_prohibit_int_ijk = \ exclude_file_name_regexp--sc_prohibit_unsigned_pid = \ ^(include/libvirt/.*\.h|src/(qemu/qemu_driver\.c|driver-hypervisor\.h|libvirt(-[a-z]*)?\.c|.*\.x|util/vir(polkit|systemd)\.c)|tests/virpolkittest\.c|tools/virsh-domain\.c)$$ -exclude_file_name_regexp--sc_avoid_attribute_unused_in_header = \ +exclude_file_name_regexp--sc_avoid_g_gnuc_unused_in_header = \ ^(src/util/virlog\.h|src/network/bridge_driver\.h)$$ exclude_file_name_regexp--sc_prohibit_mixed_case_abbreviations = \ -- 2.19.2

Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- docs/apibuild.py | 2 -- src/internal.h | 31 ------------------------------- 2 files changed, 33 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index b11d3fd5a9..4f0d170975 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -71,8 +71,6 @@ admin_included_files = { } ignored_words = { - "ATTRIBUTE_UNUSED": (0, "macro keyword"), - "ATTRIBUTE_SENTINEL": (0, "macro keyword"), "G_GNUC_UNUSED": (0, "macro keyword"), "G_GNUC_NULL_TERMINATED": (0, "macro keyword"), "VIR_DEPRECATED": (0, "macro keyword"), diff --git a/src/internal.h b/src/internal.h index 56e99241b0..7737d9a209 100644 --- a/src/internal.h +++ b/src/internal.h @@ -93,33 +93,6 @@ #define NUL_TERMINATE(buf) do { (buf)[sizeof(buf)-1] = '\0'; } while (0) #define ARRAY_CARDINALITY(Array) (sizeof(Array) / sizeof(*(Array))) -/** - * ATTRIBUTE_UNUSED: - * - * Macro to flag consciously unused parameters to functions - */ -#ifndef ATTRIBUTE_UNUSED -# define ATTRIBUTE_UNUSED __attribute__((__unused__)) -#endif - -/** - * ATTRIBUTE_NORETURN: - * - * Macro to indicate that a function won't return to the caller - */ -#ifndef ATTRIBUTE_NORETURN -# define ATTRIBUTE_NORETURN __attribute__((__noreturn__)) -#endif - -/** - * ATTRIBUTE_SENTINEL: - * - * Macro to check for NULL-terminated varargs lists - */ -#ifndef ATTRIBUTE_SENTINEL -# define ATTRIBUTE_SENTINEL __attribute__((__sentinel__)) -#endif - /** * ATTRIBUTE_NOINLINE: * @@ -150,10 +123,6 @@ # endif #endif -#ifndef ATTRIBUTE_RETURN_CHECK -# define ATTRIBUTE_RETURN_CHECK __attribute__((__warn_unused_result__)) -#endif - /** * ATTRIBUTE_PACKED * -- 2.19.2