[libvirt] [PATCH 30/35] vbox: use G_GNUC_UNUSED

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/vbox/vbox_MSCOMGlue.c | 100 +++++++++++++++++++------------------- src/vbox/vbox_common.c | 38 +++++++-------- src/vbox/vbox_driver.c | 4 +- src/vbox/vbox_storage.c | 4 +- src/vbox/vbox_tmpl.c | 92 +++++++++++++++++------------------ 5 files changed, 119 insertions(+), 119 deletions(-) diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c index 7208d73b53..db000385bc 100644 --- a/src/vbox/vbox_MSCOMGlue.c +++ b/src/vbox/vbox_MSCOMGlue.c @@ -99,45 +99,45 @@ static ISession *vboxSession; */ static nsresult __stdcall -vboxSupports_QueryInterface(nsISupports *pThis ATTRIBUTE_UNUSED, - const nsID *iid ATTRIBUTE_UNUSED, - void **resultp ATTRIBUTE_UNUSED) +vboxSupports_QueryInterface(nsISupports *pThis G_GNUC_UNUSED, + const nsID *iid G_GNUC_UNUSED, + void **resultp G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxSupports_AddRef(nsISupports *pThis ATTRIBUTE_UNUSED) +vboxSupports_AddRef(nsISupports *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxSupports_Release(nsISupports *pThis ATTRIBUTE_UNUSED) +vboxSupports_Release(nsISupports *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxSupports_GetTypeInfoCount(nsISupports *pThis ATTRIBUTE_UNUSED) +vboxSupports_GetTypeInfoCount(nsISupports *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxSupports_GetTypeInfo(nsISupports *pThis ATTRIBUTE_UNUSED) +vboxSupports_GetTypeInfo(nsISupports *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxSupports_GetIDsOfNames(nsISupports *pThis ATTRIBUTE_UNUSED) +vboxSupports_GetIDsOfNames(nsISupports *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxSupports_Invoke(nsISupports *pThis ATTRIBUTE_UNUSED) +vboxSupports_Invoke(nsISupports *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } @@ -149,15 +149,15 @@ vboxSupports_Invoke(nsISupports *pThis ATTRIBUTE_UNUSED) */ static nsresult __stdcall -vboxEventTarget_PostEvent(nsIEventTarget *pThis ATTRIBUTE_UNUSED, - PLEvent *aEvent ATTRIBUTE_UNUSED) +vboxEventTarget_PostEvent(nsIEventTarget *pThis G_GNUC_UNUSED, + PLEvent *aEvent G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxEventTarget_IsOnCurrentThread(nsIEventTarget *pThis ATTRIBUTE_UNUSED, - PRBool *_retval ATTRIBUTE_UNUSED) +vboxEventTarget_IsOnCurrentThread(nsIEventTarget *pThis G_GNUC_UNUSED, + PRBool *_retval G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } @@ -169,133 +169,133 @@ vboxEventTarget_IsOnCurrentThread(nsIEventTarget *pThis ATTRIBUTE_UNUSED, */ static nsresult __stdcall -vboxEventQueue_InitEvent(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PLEvent *aEvent ATTRIBUTE_UNUSED, - void *owner ATTRIBUTE_UNUSED, - PLHandleEventProc handler ATTRIBUTE_UNUSED, - PLDestroyEventProc destructor ATTRIBUTE_UNUSED) +vboxEventQueue_InitEvent(nsIEventQueue *pThis G_GNUC_UNUSED, + PLEvent *aEvent G_GNUC_UNUSED, + void *owner G_GNUC_UNUSED, + PLHandleEventProc handler G_GNUC_UNUSED, + PLDestroyEventProc destructor G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxEventQueue_PostSynchronousEvent(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PLEvent *aEvent ATTRIBUTE_UNUSED, - void **aResult ATTRIBUTE_UNUSED) +vboxEventQueue_PostSynchronousEvent(nsIEventQueue *pThis G_GNUC_UNUSED, + PLEvent *aEvent G_GNUC_UNUSED, + void **aResult G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxEventQueue_PendingEvents(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PRBool *_retval ATTRIBUTE_UNUSED) +vboxEventQueue_PendingEvents(nsIEventQueue *pThis G_GNUC_UNUSED, + PRBool *_retval G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxEventQueue_ProcessPendingEvents(nsIEventQueue *pThis ATTRIBUTE_UNUSED) +vboxEventQueue_ProcessPendingEvents(nsIEventQueue *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxEventQueue_EventLoop(nsIEventQueue *pThis ATTRIBUTE_UNUSED) +vboxEventQueue_EventLoop(nsIEventQueue *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxEventQueue_EventAvailable(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PRBool *aResult ATTRIBUTE_UNUSED) +vboxEventQueue_EventAvailable(nsIEventQueue *pThis G_GNUC_UNUSED, + PRBool *aResult G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxEventQueue_GetEvent(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PLEvent **_retval ATTRIBUTE_UNUSED) +vboxEventQueue_GetEvent(nsIEventQueue *pThis G_GNUC_UNUSED, + PLEvent **_retval G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxEventQueue_HandleEvent(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PLEvent *aEvent ATTRIBUTE_UNUSED) +vboxEventQueue_HandleEvent(nsIEventQueue *pThis G_GNUC_UNUSED, + PLEvent *aEvent G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxEventQueue_WaitForEvent(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PLEvent **_retval ATTRIBUTE_UNUSED) +vboxEventQueue_WaitForEvent(nsIEventQueue *pThis G_GNUC_UNUSED, + PLEvent **_retval G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static PRInt32 __stdcall -vboxEventQueue_GetEventQueueSelectFD(nsIEventQueue *pThis ATTRIBUTE_UNUSED) +vboxEventQueue_GetEventQueueSelectFD(nsIEventQueue *pThis G_GNUC_UNUSED) { return -1; } static nsresult __stdcall -vboxEventQueue_Init(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PRBool aNative ATTRIBUTE_UNUSED) +vboxEventQueue_Init(nsIEventQueue *pThis G_GNUC_UNUSED, + PRBool aNative G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxEventQueue_InitFromPRThread(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PRThread *thread ATTRIBUTE_UNUSED, - PRBool aNative ATTRIBUTE_UNUSED) +vboxEventQueue_InitFromPRThread(nsIEventQueue *pThis G_GNUC_UNUSED, + PRThread *thread G_GNUC_UNUSED, + PRBool aNative G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxEventQueue_InitFromPLQueue(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PLEventQueue *aQueue ATTRIBUTE_UNUSED) +vboxEventQueue_InitFromPLQueue(nsIEventQueue *pThis G_GNUC_UNUSED, + PLEventQueue *aQueue G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxEventQueue_EnterMonitor(nsIEventQueue *pThis ATTRIBUTE_UNUSED) +vboxEventQueue_EnterMonitor(nsIEventQueue *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxEventQueue_ExitMonitor(nsIEventQueue *pThis ATTRIBUTE_UNUSED) +vboxEventQueue_ExitMonitor(nsIEventQueue *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxEventQueue_RevokeEvents(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - void *owner ATTRIBUTE_UNUSED) +vboxEventQueue_RevokeEvents(nsIEventQueue *pThis G_GNUC_UNUSED, + void *owner G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxEventQueue_GetPLEventQueue(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PLEventQueue **_retval ATTRIBUTE_UNUSED) +vboxEventQueue_GetPLEventQueue(nsIEventQueue *pThis G_GNUC_UNUSED, + PLEventQueue **_retval G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxEventQueue_IsQueueNative(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PRBool *_retval ATTRIBUTE_UNUSED) +vboxEventQueue_IsQueueNative(nsIEventQueue *pThis G_GNUC_UNUSED, + PRBool *_retval G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } static nsresult __stdcall -vboxEventQueue_StopAcceptingEvents(nsIEventQueue *pThis ATTRIBUTE_UNUSED) +vboxEventQueue_StopAcceptingEvents(nsIEventQueue *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 748133933c..50c7de3e02 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -508,8 +508,8 @@ vboxConnectURIProbe(char **uri) static virDrvOpenStatus vboxConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { vboxDriverPtr driver = NULL; @@ -541,7 +541,7 @@ static int vboxConnectClose(virConnectPtr conn) } static int -vboxDomainSave(virDomainPtr dom, const char *path ATTRIBUTE_UNUSED) +vboxDomainSave(virDomainPtr dom, const char *path G_GNUC_UNUSED) { vboxDriverPtr data = dom->conn->privateData; IConsole *console = NULL; @@ -557,7 +557,7 @@ vboxDomainSave(virDomainPtr dom, const char *path ATTRIBUTE_UNUSED) /* VirtualBox currently doesn't support saving to a file * at a location other then the machine folder and thus - * setting path to ATTRIBUTE_UNUSED for now, will change + * setting path to G_GNUC_UNUSED for now, will change * this behaviour once get the VirtualBox API in right * shape to do this */ @@ -607,30 +607,30 @@ static int vboxConnectGetVersion(virConnectPtr conn, unsigned long *version) return 0; } -static char *vboxConnectGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) +static char *vboxConnectGetHostname(virConnectPtr conn G_GNUC_UNUSED) { return virGetHostname(); } -static int vboxConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int vboxConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* Driver is using local, non-network based transport */ return 1; } -static int vboxConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int vboxConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* No encryption is needed, or used on the local transport*/ return 0; } -static int vboxConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int vboxConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } static int -vboxConnectGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) +vboxConnectGetMaxVcpus(virConnectPtr conn, const char *type G_GNUC_UNUSED) { vboxDriverPtr data = conn->privateData; PRUint32 maxCPUCount = 0; @@ -640,7 +640,7 @@ vboxConnectGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) return ret; /* VirtualBox Supports only hvm and thus the type passed to it - * has no meaning, setting it to ATTRIBUTE_UNUSED + * has no meaning, setting it to G_GNUC_UNUSED */ ISystemProperties *systemProperties = NULL; @@ -2693,7 +2693,7 @@ static int vboxDomainDestroy(virDomainPtr dom) return vboxDomainDestroyFlags(dom, 0); } -static char *vboxDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) { +static char *vboxDomainGetOSType(virDomainPtr dom G_GNUC_UNUSED) { /* Returning "hvm" always as suggested on list, cause * this functions seems to be badly named and it * is supposed to pass the ABI name and not the domain @@ -3448,7 +3448,7 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) } static int -vboxDumpVideo(virDomainDefPtr def, vboxDriverPtr data ATTRIBUTE_UNUSED, +vboxDumpVideo(virDomainDefPtr def, vboxDriverPtr data G_GNUC_UNUSED, IMachine *machine) { /* dump video options vram/2d/3d/directx/etc. */ @@ -3797,7 +3797,7 @@ vboxDumpNetworks(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRU } static void -vboxDumpAudio(virDomainDefPtr def, vboxDriverPtr data ATTRIBUTE_UNUSED, +vboxDumpAudio(virDomainDefPtr def, vboxDriverPtr data G_GNUC_UNUSED, IMachine *machine) { /* dump sound card if active */ @@ -4281,7 +4281,7 @@ static int vboxConnectNumOfDefinedDomains(virConnectPtr conn) static int vboxDomainAttachDeviceImpl(virDomainPtr dom, const char *xml, - int mediaChangeOnly ATTRIBUTE_UNUSED) + int mediaChangeOnly G_GNUC_UNUSED) { vboxDriverPtr data = dom->conn->privateData; IMachine *machine = NULL; @@ -7714,14 +7714,14 @@ vboxConnectListAllDomains(virConnectPtr conn, #undef MATCH static int -vboxNodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, +vboxNodeGetInfo(virConnectPtr conn G_GNUC_UNUSED, virNodeInfoPtr nodeinfo) { return virCapabilitiesGetNodeInfo(nodeinfo); } static int -vboxNodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED, +vboxNodeGetCellsFreeMemory(virConnectPtr conn G_GNUC_UNUSED, unsigned long long *freeMems, int startCell, int maxCells) @@ -7730,7 +7730,7 @@ vboxNodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED, } static unsigned long long -vboxNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED) +vboxNodeGetFreeMemory(virConnectPtr conn G_GNUC_UNUSED) { unsigned long long freeMem; if (virHostMemGetInfo(NULL, &freeMem) < 0) @@ -7739,7 +7739,7 @@ vboxNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED) } static int -vboxNodeGetFreePages(virConnectPtr conn ATTRIBUTE_UNUSED, +vboxNodeGetFreePages(virConnectPtr conn G_GNUC_UNUSED, unsigned int npages, unsigned int *pages, int startCell, @@ -7753,7 +7753,7 @@ vboxNodeGetFreePages(virConnectPtr conn ATTRIBUTE_UNUSED, } static int -vboxNodeAllocPages(virConnectPtr conn ATTRIBUTE_UNUSED, +vboxNodeAllocPages(virConnectPtr conn G_GNUC_UNUSED, unsigned int npages, unsigned int *pageSizes, unsigned long long *pageCounts, diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index d7e80828ab..5bc9ae6102 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -50,8 +50,8 @@ VIR_LOG_INIT("vbox.vbox_driver"); #if defined(VBOX_DRIVER) static virDrvOpenStatus dummyConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { uid_t uid = geteuid(); diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index f879e287cb..1ef4a39667 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -42,7 +42,7 @@ static vboxUniformedAPI gVBoxAPI; * The Storage Functions here on */ -static int vboxConnectNumOfStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED) +static int vboxConnectNumOfStoragePools(virConnectPtr conn G_GNUC_UNUSED) { /** Currently only one pool supported, the default one * given by ISystemProperties::defaultHardDiskFolder() @@ -51,7 +51,7 @@ static int vboxConnectNumOfStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED) return 1; } -static int vboxConnectListStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED, +static int vboxConnectListStoragePools(virConnectPtr conn G_GNUC_UNUSED, char **const names, int nnames) { int numActive = 0; diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 88b712c8cb..72011199cf 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -500,9 +500,9 @@ static void _DEBUGIID(vboxDriverPtr data, const char *msg, vboxIID *iid) } static void -_vboxIIDToUtf8(vboxDriverPtr data ATTRIBUTE_UNUSED, - vboxIID *iid ATTRIBUTE_UNUSED, - char **utf8 ATTRIBUTE_UNUSED) +_vboxIIDToUtf8(vboxDriverPtr data G_GNUC_UNUSED, + vboxIID *iid G_GNUC_UNUSED, + char **utf8 G_GNUC_UNUSED) { data->pFuncs->pfnUtf16ToUtf8(iid->value, utf8); } @@ -548,7 +548,7 @@ static void* _handleSnapshotGetChildren(ISnapshot *snapshot) return snapshot->vtbl->GetChildren; } -static void* _handleMediumGetChildren(IMedium *medium ATTRIBUTE_UNUSED) +static void* _handleMediumGetChildren(IMedium *medium G_GNUC_UNUSED) { return medium->vtbl->GetChildren; } @@ -609,7 +609,7 @@ _virtualboxGetHost(IVirtualBox *vboxObj, IHost **host) } static nsresult -_virtualboxCreateMachine(vboxDriverPtr data, virDomainDefPtr def, IMachine **machine, char *uuidstr ATTRIBUTE_UNUSED) +_virtualboxCreateMachine(vboxDriverPtr data, virDomainDefPtr def, IMachine **machine, char *uuidstr G_GNUC_UNUSED) { vboxIID iid = VBOX_IID_INITIALIZER; PRUnichar *machineNameUtf16 = NULL; @@ -662,7 +662,7 @@ static nsresult _virtualboxFindHardDisk(IVirtualBox *vboxObj, PRUnichar *location, PRUint32 deviceType, - PRUint32 accessMode ATTRIBUTE_UNUSED, + PRUint32 accessMode G_GNUC_UNUSED, IMedium **medium) { return vboxObj->vtbl->OpenMedium(vboxObj, location, deviceType, accessMode, @@ -737,7 +737,7 @@ _machineAttachDevice(IMachine *machine, static nsresult _machineCreateSharedFolder(IMachine *machine, PRUnichar *name, PRUnichar *hostPath, PRBool writable, - PRBool automount ATTRIBUTE_UNUSED) + PRBool automount G_GNUC_UNUSED) { return machine->vtbl->CreateSharedFolder(machine, name, hostPath, writable, automount); @@ -751,8 +751,8 @@ _machineRemoveSharedFolder(IMachine *machine, PRUnichar *name) static nsresult _machineLaunchVMProcess(vboxDriverPtr data, - IMachine *machine ATTRIBUTE_UNUSED, - vboxIID *iid ATTRIBUTE_UNUSED, + IMachine *machine G_GNUC_UNUSED, + vboxIID *iid G_GNUC_UNUSED, PRUnichar *sessionType, PRUnichar *env, IProgress **progress) { @@ -761,10 +761,10 @@ _machineLaunchVMProcess(vboxDriverPtr data, } static nsresult -_machineUnregister(IMachine *machine ATTRIBUTE_UNUSED, - PRUint32 cleanupMode ATTRIBUTE_UNUSED, - PRUint32 *aMediaSize ATTRIBUTE_UNUSED, - IMedium ***aMedia ATTRIBUTE_UNUSED) +_machineUnregister(IMachine *machine G_GNUC_UNUSED, + PRUint32 cleanupMode G_GNUC_UNUSED, + PRUint32 *aMediaSize G_GNUC_UNUSED, + IMedium ***aMedia G_GNUC_UNUSED) { return machine->vtbl->Unregister(machine, cleanupMode, aMediaSize, aMedia); } @@ -825,7 +825,7 @@ _machineGetNetworkAdapter(IMachine *machine, PRUint32 slot, INetworkAdapter **ad } static nsresult -_machineGetChipsetType(IMachine *machine ATTRIBUTE_UNUSED, PRUint32 *chipsetType ATTRIBUTE_UNUSED) +_machineGetChipsetType(IMachine *machine G_GNUC_UNUSED, PRUint32 *chipsetType G_GNUC_UNUSED) { return machine->vtbl->GetChipsetType(machine, chipsetType); } @@ -891,13 +891,13 @@ _machineSetMemorySize(IMachine *machine, PRUint32 memorySize) } static nsresult -_machineGetCPUProperty(IMachine *machine, PRUint32 property ATTRIBUTE_UNUSED, PRBool *value) +_machineGetCPUProperty(IMachine *machine, PRUint32 property G_GNUC_UNUSED, PRBool *value) { return machine->vtbl->GetCPUProperty(machine, property, value); } static nsresult -_machineSetCPUProperty(IMachine *machine, PRUint32 property ATTRIBUTE_UNUSED, PRBool value) +_machineSetCPUProperty(IMachine *machine, PRUint32 property G_GNUC_UNUSED, PRBool value) { return machine->vtbl->SetCPUProperty(machine, property, value); } @@ -989,13 +989,13 @@ _machineSaveSettings(IMachine *machine) } static nsresult -_sessionOpen(vboxDriverPtr data, vboxIID *iid ATTRIBUTE_UNUSED, IMachine *machine) +_sessionOpen(vboxDriverPtr data, vboxIID *iid G_GNUC_UNUSED, IMachine *machine) { return machine->vtbl->LockMachine(machine, data->vboxSession, LockType_Write); } static nsresult -_sessionOpenExisting(vboxDriverPtr data, vboxIID *iid ATTRIBUTE_UNUSED, IMachine *machine) +_sessionOpenExisting(vboxDriverPtr data, vboxIID *iid G_GNUC_UNUSED, IMachine *machine) { return machine->vtbl->LockMachine(machine, data->vboxSession, LockType_Shared); } @@ -1156,7 +1156,7 @@ _systemPropertiesGetMaxBootPosition(ISystemProperties *systemProperties, PRUint3 } static nsresult -_systemPropertiesGetMaxNetworkAdapters(ISystemProperties *systemProperties, PRUint32 chipset ATTRIBUTE_UNUSED, +_systemPropertiesGetMaxNetworkAdapters(ISystemProperties *systemProperties, PRUint32 chipset G_GNUC_UNUSED, PRUint32 *maxNetworkAdapters) { return systemProperties->vtbl->GetMaxNetworkAdapters(systemProperties, chipset, @@ -1580,7 +1580,7 @@ _vrdeServerSetAllowMultiConnection(IVRDEServer *VRDEServer, PRBool enabled) } static nsresult -_vrdeServerGetNetAddress(vboxDriverPtr data ATTRIBUTE_UNUSED, +_vrdeServerGetNetAddress(vboxDriverPtr data G_GNUC_UNUSED, IVRDEServer *VRDEServer, PRUnichar **netAddress) { PRUnichar *VRDENetAddressKey = NULL; @@ -1594,7 +1594,7 @@ _vrdeServerGetNetAddress(vboxDriverPtr data ATTRIBUTE_UNUSED, } static nsresult -_vrdeServerSetNetAddress(vboxDriverPtr data ATTRIBUTE_UNUSED, +_vrdeServerSetNetAddress(vboxDriverPtr data G_GNUC_UNUSED, IVRDEServer *VRDEServer, PRUnichar *netAddress) { PRUnichar *netAddressKey = NULL; @@ -1609,14 +1609,14 @@ _vrdeServerSetNetAddress(vboxDriverPtr data ATTRIBUTE_UNUSED, } static nsresult -_usbCommonEnable(IUSBCommon *USBCommon ATTRIBUTE_UNUSED) +_usbCommonEnable(IUSBCommon *USBCommon G_GNUC_UNUSED) { /* We don't need to set usb enabled for vbox 4.3 and later */ return 0; } static nsresult -_usbCommonGetEnabled(IUSBCommon *USBCommon ATTRIBUTE_UNUSED, PRBool *enabled) +_usbCommonGetEnabled(IUSBCommon *USBCommon G_GNUC_UNUSED, PRBool *enabled) { *enabled = true; return 0; @@ -1703,8 +1703,8 @@ static nsresult _mediumGetSize(IMedium *medium, PRUint64 *uSize) return rc; } -static nsresult _mediumGetReadOnly(IMedium *medium ATTRIBUTE_UNUSED, - PRBool *readOnly ATTRIBUTE_UNUSED) +static nsresult _mediumGetReadOnly(IMedium *medium G_GNUC_UNUSED, + PRBool *readOnly G_GNUC_UNUSED) { return medium->vtbl->GetReadOnly(medium, readOnly); } @@ -1743,18 +1743,18 @@ static nsresult _mediumClose(IMedium *medium) return medium->vtbl->Close(medium); } -static nsresult _mediumSetType(IMedium *medium ATTRIBUTE_UNUSED, - PRUint32 type ATTRIBUTE_UNUSED) +static nsresult _mediumSetType(IMedium *medium G_GNUC_UNUSED, + PRUint32 type G_GNUC_UNUSED) { return medium->vtbl->SetType(medium, type); } static nsresult -_mediumCreateDiffStorage(IMedium *medium ATTRIBUTE_UNUSED, - IMedium *target ATTRIBUTE_UNUSED, - PRUint32 variantSize ATTRIBUTE_UNUSED, - PRUint32 *variant ATTRIBUTE_UNUSED, - IProgress **progress ATTRIBUTE_UNUSED) +_mediumCreateDiffStorage(IMedium *medium G_GNUC_UNUSED, + IMedium *target G_GNUC_UNUSED, + PRUint32 variantSize G_GNUC_UNUSED, + PRUint32 *variant G_GNUC_UNUSED, + IProgress **progress G_GNUC_UNUSED) { return medium->vtbl->CreateDiffStorage(medium, target, variantSize, variant, progress); } @@ -1793,8 +1793,8 @@ _mediumAttachmentGetController(IMediumAttachment *mediumAttachment, } static nsresult -_mediumAttachmentGetType(IMediumAttachment *mediumAttachment ATTRIBUTE_UNUSED, - PRUint32 *type ATTRIBUTE_UNUSED) +_mediumAttachmentGetType(IMediumAttachment *mediumAttachment G_GNUC_UNUSED, + PRUint32 *type G_GNUC_UNUSED) { return mediumAttachment->vtbl->GetType(mediumAttachment, type); } @@ -1890,13 +1890,13 @@ _snapshotGetOnline(ISnapshot *snapshot, PRBool *online) } static nsresult -_displayGetScreenResolution(IDisplay *display ATTRIBUTE_UNUSED, - PRUint32 screenId ATTRIBUTE_UNUSED, - PRUint32 *width ATTRIBUTE_UNUSED, - PRUint32 *height ATTRIBUTE_UNUSED, - PRUint32 *bitsPerPixel ATTRIBUTE_UNUSED, - PRInt32 *xOrigin ATTRIBUTE_UNUSED, - PRInt32 *yOrigin ATTRIBUTE_UNUSED) +_displayGetScreenResolution(IDisplay *display G_GNUC_UNUSED, + PRUint32 screenId G_GNUC_UNUSED, + PRUint32 *width G_GNUC_UNUSED, + PRUint32 *height G_GNUC_UNUSED, + PRUint32 *bitsPerPixel G_GNUC_UNUSED, + PRInt32 *xOrigin G_GNUC_UNUSED, + PRInt32 *yOrigin G_GNUC_UNUSED) { PRUint32 gms; @@ -1933,8 +1933,8 @@ _hostFindHostNetworkInterfaceByName(IHost *host, PRUnichar *name, } static nsresult -_hostCreateHostOnlyNetworkInterface(vboxDriverPtr data ATTRIBUTE_UNUSED, - IHost *host, char *name ATTRIBUTE_UNUSED, +_hostCreateHostOnlyNetworkInterface(vboxDriverPtr data G_GNUC_UNUSED, + IHost *host, char *name G_GNUC_UNUSED, IHostNetworkInterface **networkInterface) { nsresult rc = -1; @@ -1952,9 +1952,9 @@ _hostCreateHostOnlyNetworkInterface(vboxDriverPtr data ATTRIBUTE_UNUSED, } static nsresult -_hostRemoveHostOnlyNetworkInterface(IHost *host ATTRIBUTE_UNUSED, - vboxIID *iid ATTRIBUTE_UNUSED, - IProgress **progress ATTRIBUTE_UNUSED) +_hostRemoveHostOnlyNetworkInterface(IHost *host G_GNUC_UNUSED, + vboxIID *iid G_GNUC_UNUSED, + IProgress **progress G_GNUC_UNUSED) { return host->vtbl->RemoveHostOnlyNetworkInterface(host, iid->value, progress); } -- 2.19.2