External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 19:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

esx: use G_GNUC_UNUSED

Browse Source 
Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED.

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

32
src/esx/esx_driver.c
View File

@ -825,7 +825,7 @@ esxConnectToVCenter(esxPrivate *priv,
*/ */
static virDrvOpenStatus static virDrvOpenStatus
esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth,
virConfPtr conf ATTRIBUTE_UNUSED, virConfPtr conf G_GNUC_UNUSED,
unsigned int flags) unsigned int flags)
{ {
virDrvOpenStatus result = VIR_DRV_OPEN_ERROR; virDrvOpenStatus result = VIR_DRV_OPEN_ERROR;
@ -1097,7 +1097,7 @@ esxConnectSupportsFeature(virConnectPtr conn, int feature)
static const char * static const char *
esxConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) esxConnectGetType(virConnectPtr conn G_GNUC_UNUSED)
{ {
return "ESX"; return "ESX";
} }
@ -1852,7 +1852,7 @@ esxDomainDestroy(virDomainPtr dom)
static char * static char *
esxDomainGetOSType(virDomainPtr domain ATTRIBUTE_UNUSED) esxDomainGetOSType(virDomainPtr domain G_GNUC_UNUSED)
{ {
char *osType; char *osType;
@ -3450,7 +3450,7 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart)
* SharesLevel 'low', 'normal' and 'high'. * SharesLevel 'low', 'normal' and 'high'.
*/ */
static char * static char *
esxDomainGetSchedulerType(virDomainPtr domain ATTRIBUTE_UNUSED, int *nparams) esxDomainGetSchedulerType(virDomainPtr domain G_GNUC_UNUSED, int *nparams)
{ {
char *type; char *type;
@ -3736,13 +3736,13 @@ esxDomainSetSchedulerParameters(virDomainPtr domain,
static int static int
esxDomainMigratePrepare(virConnectPtr dconn, esxDomainMigratePrepare(virConnectPtr dconn,
char **cookie ATTRIBUTE_UNUSED, char **cookie G_GNUC_UNUSED,
int *cookielen ATTRIBUTE_UNUSED, int *cookielen G_GNUC_UNUSED,
const char *uri_in ATTRIBUTE_UNUSED, const char *uri_in G_GNUC_UNUSED,
char **uri_out, char **uri_out,
unsigned long flags, unsigned long flags,
const char *dname ATTRIBUTE_UNUSED, const char *dname G_GNUC_UNUSED,
unsigned long resource ATTRIBUTE_UNUSED) unsigned long resource G_GNUC_UNUSED)
{ {
esxPrivate *priv = dconn->privateData; esxPrivate *priv = dconn->privateData;
@ -3763,12 +3763,12 @@ esxDomainMigratePrepare(virConnectPtr dconn,
static int static int
esxDomainMigratePerform(virDomainPtr domain, esxDomainMigratePerform(virDomainPtr domain,
const char *cookie ATTRIBUTE_UNUSED, const char *cookie G_GNUC_UNUSED,
int cookielen ATTRIBUTE_UNUSED, int cookielen G_GNUC_UNUSED,
const char *uri, const char *uri,
unsigned long flags, unsigned long flags,
const char *dname, const char *dname,
unsigned long bandwidth ATTRIBUTE_UNUSED) unsigned long bandwidth G_GNUC_UNUSED)
{ {
int result = -1; int result = -1;
esxPrivate *priv = domain->conn->privateData; esxPrivate *priv = domain->conn->privateData;
@ -3906,9 +3906,9 @@ esxDomainMigratePerform(virDomainPtr domain,
static virDomainPtr static virDomainPtr
esxDomainMigrateFinish(virConnectPtr dconn, const char *dname, esxDomainMigrateFinish(virConnectPtr dconn, const char *dname,
const char *cookie ATTRIBUTE_UNUSED, const char *cookie G_GNUC_UNUSED,
int cookielen ATTRIBUTE_UNUSED, int cookielen G_GNUC_UNUSED,
const char *uri ATTRIBUTE_UNUSED, const char *uri G_GNUC_UNUSED,
unsigned long flags) unsigned long flags)
{ {
virCheckFlags(ESX_MIGRATION_FLAGS, NULL); virCheckFlags(ESX_MIGRATION_FLAGS, NULL);
@ -4060,7 +4060,7 @@ esxDomainIsPersistent(virDomainPtr domain)
static int static int
esxDomainIsUpdated(virDomainPtr domain ATTRIBUTE_UNUSED) esxDomainIsUpdated(virDomainPtr domain G_GNUC_UNUSED)
{ {
/* ESX domains never have a persistent state that differs from /* ESX domains never have a persistent state that differs from
* current state. However, we do want to check for existence. */ * current state. However, we do want to check for existence. */

10
src/esx/esx_interface_driver.c
View File

@ -107,7 +107,7 @@ esxConnectListInterfaces(virConnectPtr conn, char **const names, int maxnames)
static int static int
esxConnectNumOfDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED) esxConnectNumOfDefinedInterfaces(virConnectPtr conn G_GNUC_UNUSED)
{ {
/* ESX interfaces are always active */ /* ESX interfaces are always active */
return 0; return 0;
@ -116,9 +116,9 @@ esxConnectNumOfDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED)
static int static int
esxConnectListDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED, esxConnectListDefinedInterfaces(virConnectPtr conn G_GNUC_UNUSED,
char **const names ATTRIBUTE_UNUSED, char **const names G_GNUC_UNUSED,
int maxnames ATTRIBUTE_UNUSED) int maxnames G_GNUC_UNUSED)
{ {
/* ESX interfaces are always active */ /* ESX interfaces are always active */
return 0; return 0;
@ -250,7 +250,7 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags)
static int static int
esxInterfaceIsActive(virInterfacePtr iface ATTRIBUTE_UNUSED) esxInterfaceIsActive(virInterfacePtr iface G_GNUC_UNUSED)
{ {
/* ESX interfaces are always active */ /* ESX interfaces are always active */
return 1; return 1;

16
src/esx/esx_network_driver.c
View File

@ -115,7 +115,7 @@ esxConnectListNetworks(virConnectPtr conn, char **const names, int maxnames)
static int static int
esxConnectNumOfDefinedNetworks(virConnectPtr conn ATTRIBUTE_UNUSED) esxConnectNumOfDefinedNetworks(virConnectPtr conn G_GNUC_UNUSED)
{ {
/* ESX networks are always active */ /* ESX networks are always active */
return 0; return 0;
@ -124,9 +124,9 @@ esxConnectNumOfDefinedNetworks(virConnectPtr conn ATTRIBUTE_UNUSED)
static int static int
esxConnectListDefinedNetworks(virConnectPtr conn ATTRIBUTE_UNUSED, esxConnectListDefinedNetworks(virConnectPtr conn G_GNUC_UNUSED,
char **const names ATTRIBUTE_UNUSED, char **const names G_GNUC_UNUSED,
int maxnames ATTRIBUTE_UNUSED) int maxnames G_GNUC_UNUSED)
{ {
/* ESX networks are always active */ /* ESX networks are always active */
return 0; return 0;
@ -823,7 +823,7 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags)
static int static int
esxNetworkGetAutostart(virNetworkPtr network ATTRIBUTE_UNUSED, esxNetworkGetAutostart(virNetworkPtr network G_GNUC_UNUSED,
int *autostart) int *autostart)
{ {
/* ESX networks are always active */ /* ESX networks are always active */
@ -835,7 +835,7 @@ esxNetworkGetAutostart(virNetworkPtr network ATTRIBUTE_UNUSED,
static int static int
esxNetworkSetAutostart(virNetworkPtr network ATTRIBUTE_UNUSED, esxNetworkSetAutostart(virNetworkPtr network G_GNUC_UNUSED,
int autostart) int autostart)
{ {
/* Just accept autostart activation, but fail on autostart deactivation */ /* Just accept autostart activation, but fail on autostart deactivation */
@ -853,7 +853,7 @@ esxNetworkSetAutostart(virNetworkPtr network ATTRIBUTE_UNUSED,
static int static int
esxNetworkIsActive(virNetworkPtr network ATTRIBUTE_UNUSED) esxNetworkIsActive(virNetworkPtr network G_GNUC_UNUSED)
{ {
/* ESX networks are always active */ /* ESX networks are always active */
return 1; return 1;
@ -862,7 +862,7 @@ esxNetworkIsActive(virNetworkPtr network ATTRIBUTE_UNUSED)
static int 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 */ /* ESX has no concept of transient networks, so all of them are persistent */
return 1; return 1;

16
src/esx/esx_storage_backend_iscsi.c
View File

@ -276,7 +276,7 @@ esxStoragePoolRefresh(virStoragePoolPtr pool,
static int static int
esxStoragePoolGetInfo(virStoragePoolPtr pool ATTRIBUTE_UNUSED, esxStoragePoolGetInfo(virStoragePoolPtr pool G_GNUC_UNUSED,
virStoragePoolInfoPtr info) virStoragePoolInfoPtr info)
{ {
/* These fields are not valid for iSCSI pool */ /* These fields are not valid for iSCSI pool */
@ -582,8 +582,8 @@ esxStorageVolLookupByKey(virConnectPtr conn, const char *key)
static virStorageVolPtr static virStorageVolPtr
esxStorageVolCreateXML(virStoragePoolPtr pool ATTRIBUTE_UNUSED, esxStorageVolCreateXML(virStoragePoolPtr pool G_GNUC_UNUSED,
const char *xmldesc ATTRIBUTE_UNUSED, const char *xmldesc G_GNUC_UNUSED,
unsigned int flags) unsigned int flags)
{ {
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
@ -597,9 +597,9 @@ esxStorageVolCreateXML(virStoragePoolPtr pool ATTRIBUTE_UNUSED,
static virStorageVolPtr static virStorageVolPtr
esxStorageVolCreateXMLFrom(virStoragePoolPtr pool ATTRIBUTE_UNUSED, esxStorageVolCreateXMLFrom(virStoragePoolPtr pool G_GNUC_UNUSED,
const char *xmldesc ATTRIBUTE_UNUSED, const char *xmldesc G_GNUC_UNUSED,
virStorageVolPtr sourceVolume ATTRIBUTE_UNUSED, virStorageVolPtr sourceVolume G_GNUC_UNUSED,
unsigned int flags) unsigned int flags)
{ {
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
@ -733,7 +733,7 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume,
static int static int
esxStorageVolDelete(virStorageVolPtr volume ATTRIBUTE_UNUSED, esxStorageVolDelete(virStorageVolPtr volume G_GNUC_UNUSED,
unsigned int flags) unsigned int flags)
{ {
virCheckFlags(0, -1); virCheckFlags(0, -1);
@ -747,7 +747,7 @@ esxStorageVolDelete(virStorageVolPtr volume ATTRIBUTE_UNUSED,
static int static int
esxStorageVolWipe(virStorageVolPtr volume ATTRIBUTE_UNUSED, esxStorageVolWipe(virStorageVolPtr volume G_GNUC_UNUSED,
unsigned int flags) unsigned int flags)
{ {
virCheckFlags(0, -1); virCheckFlags(0, -1);

16
src/esx/esx_storage_driver.c
View File

@ -117,7 +117,7 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, int maxnames)
static int static int
esxConnectNumOfDefinedStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED) esxConnectNumOfDefinedStoragePools(virConnectPtr conn G_GNUC_UNUSED)
{ {
/* ESX storage pools are always active */ /* ESX storage pools are always active */
return 0; return 0;
@ -126,9 +126,9 @@ esxConnectNumOfDefinedStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED)
static int static int
esxConnectListDefinedStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED, esxConnectListDefinedStoragePools(virConnectPtr conn G_GNUC_UNUSED,
char **const names ATTRIBUTE_UNUSED, char **const names G_GNUC_UNUSED,
int maxnames ATTRIBUTE_UNUSED) int maxnames G_GNUC_UNUSED)
{ {
/* ESX storage pools are always active */ /* ESX storage pools are always active */
return 0; return 0;
@ -251,7 +251,7 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags)
static int static int
esxStoragePoolGetAutostart(virStoragePoolPtr pool ATTRIBUTE_UNUSED, esxStoragePoolGetAutostart(virStoragePoolPtr pool G_GNUC_UNUSED,
int *autostart) int *autostart)
{ {
/* ESX storage pools are always active */ /* ESX storage pools are always active */
@ -263,7 +263,7 @@ esxStoragePoolGetAutostart(virStoragePoolPtr pool ATTRIBUTE_UNUSED,
static int static int
esxStoragePoolSetAutostart(virStoragePoolPtr pool ATTRIBUTE_UNUSED, esxStoragePoolSetAutostart(virStoragePoolPtr pool G_GNUC_UNUSED,
int autostart) int autostart)
{ {
/* Just accept autostart activation, but fail on autostart deactivation */ /* Just accept autostart activation, but fail on autostart deactivation */
@ -500,7 +500,7 @@ esxStorageVolGetPath(virStorageVolPtr volume)
static int static int
esxStoragePoolIsActive(virStoragePoolPtr pool ATTRIBUTE_UNUSED) esxStoragePoolIsActive(virStoragePoolPtr pool G_GNUC_UNUSED)
{ {
/* ESX storage pools are always active */ /* ESX storage pools are always active */
return 1; return 1;
@ -509,7 +509,7 @@ esxStoragePoolIsActive(virStoragePoolPtr pool ATTRIBUTE_UNUSED)
static int 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 */ /* ESX has no concept of transient pools, so all of them are persistent */
return 1; return 1;

20
src/esx/esx_vi.c
View File

@ -64,7 +64,7 @@ VIR_LOG_INIT("esx.esx_vi");
void \ void \
esxVI_##_type##_Free(esxVI_##_type **ptrptr) \ esxVI_##_type##_Free(esxVI_##_type **ptrptr) \
{ \ { \
esxVI_##_type *item ATTRIBUTE_UNUSED; \ esxVI_##_type *item G_GNUC_UNUSED; \
\ \
if (!ptrptr || !(*ptrptr)) { \ if (!ptrptr || !(*ptrptr)) { \
return; \ 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 #if ESX_VI__CURL__ENABLE_DEBUG_OUTPUT
static int static int
esxVI_CURL_Debug(CURL *curl ATTRIBUTE_UNUSED, curl_infotype type, esxVI_CURL_Debug(CURL *curl G_GNUC_UNUSED, curl_infotype type,
char *info, size_t size, void *userdata ATTRIBUTE_UNUSED) char *info, size_t size, void *userdata G_GNUC_UNUSED)
{ {
char *buffer = NULL; char *buffer = NULL;
@ -475,8 +475,8 @@ esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, const char *content)
*/ */
static void static void
esxVI_SharedCURL_Lock(CURL *handle ATTRIBUTE_UNUSED, curl_lock_data data, esxVI_SharedCURL_Lock(CURL *handle G_GNUC_UNUSED, curl_lock_data data,
curl_lock_access access_ ATTRIBUTE_UNUSED, void *userptr) curl_lock_access access_ G_GNUC_UNUSED, void *userptr)
{ {
size_t i; size_t i;
esxVI_SharedCURL *shared = userptr; esxVI_SharedCURL *shared = userptr;
@ -503,7 +503,7 @@ esxVI_SharedCURL_Lock(CURL *handle ATTRIBUTE_UNUSED, curl_lock_data data,
} }
static void 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) void *userptr)
{ {
size_t i; size_t i;
@ -649,10 +649,10 @@ esxVI_SharedCURL_Remove(esxVI_SharedCURL *shared, esxVI_CURL *curl)
#if ESX_EMULATE_CURL_MULTI_WAIT #if ESX_EMULATE_CURL_MULTI_WAIT
static int static int
esxVI_MultiCURL_SocketCallback(CURL *handle ATTRIBUTE_UNUSED, esxVI_MultiCURL_SocketCallback(CURL *handle G_GNUC_UNUSED,
curl_socket_t fd, int action, curl_socket_t fd, int action,
void *callback_opaque, void *callback_opaque,
void *socket_opaque ATTRIBUTE_UNUSED) void *socket_opaque G_GNUC_UNUSED)
{ {
esxVI_MultiCURL *multi = callback_opaque; esxVI_MultiCURL *multi = callback_opaque;
size_t i; size_t i;
@ -695,8 +695,8 @@ esxVI_MultiCURL_SocketCallback(CURL *handle ATTRIBUTE_UNUSED,
} }
static int static int
esxVI_MultiCURL_TimerCallback(CURLM *handle ATTRIBUTE_UNUSED, esxVI_MultiCURL_TimerCallback(CURLM *handle G_GNUC_UNUSED,
long timeout_ms ATTRIBUTE_UNUSED, long timeout_ms G_GNUC_UNUSED,
void *callback_opaque) void *callback_opaque)
{ {
esxVI_MultiCURL *multi = callback_opaque; esxVI_MultiCURL *multi = callback_opaque;

4
src/esx/esx_vi_types.c
View File

@ -58,7 +58,7 @@ VIR_LOG_INIT("esx.esx_vi_types");
void \ void \
esxVI_##_type##_Free(esxVI_##_type **ptrptr) \ esxVI_##_type##_Free(esxVI_##_type **ptrptr) \
{ \ { \
esxVI_##_type *item ATTRIBUTE_UNUSED; \ esxVI_##_type *item G_GNUC_UNUSED; \
\ \
if (!ptrptr || !(*ptrptr)) { \ if (!ptrptr || !(*ptrptr)) { \
return; \ return; \
@ -185,7 +185,7 @@ VIR_LOG_INIT("esx.esx_vi_types");
esxVI_##_type##_Cast##_dest_extra##FromAnyType(esxVI_AnyType *anyType, \ esxVI_##_type##_Cast##_dest_extra##FromAnyType(esxVI_AnyType *anyType, \
_dest_type **ptrptr) \ _dest_type **ptrptr) \
{ \ { \
_dest_type *item ATTRIBUTE_UNUSED; \ _dest_type *item G_GNUC_UNUSED; \
\ \
if (!anyType || !ptrptr || *ptrptr) { \ if (!anyType || !ptrptr || *ptrptr) { \
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", \ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", \