From 61076cc8b235a797099c044b3560af2afecc1c67 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Fri, 6 Sep 2013 19:04:24 +0100
Subject: Remote compiler annotation attributes

Remove ATTRIBUTE_NONNULL and ATTRIBUTE_UNUSED

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 libvirt-override.c | 281 ++++++++++++++++++++++++++---------------------------
 1 file changed, 140 insertions(+), 141 deletions(-)

diff --git a/libvirt-override.c b/libvirt-override.c
index 6867693..f4a36cf 100644
--- a/libvirt-override.c
+++ b/libvirt-override.c
@@ -145,7 +145,7 @@ cleanup:
  * must NOT clear the array before freeing it, as it points into info
  * rather than allocated strings.  Return NULL on failure, after
  * raising a python exception.  */
-static virTypedParameterPtr ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
+static virTypedParameterPtr
 setPyVirTypedParameter(PyObject *info,
                        const virTypedParameterPtr params, int nparams)
 {
@@ -270,7 +270,6 @@ typedef virPyTypedParamsHint *virPyTypedParamsHintPtr;
  * specific parameters.
  */
 static int
-ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
 virPyDictToTypedParams(PyObject *dict,
                        virTypedParameterPtr *ret_params,
                        int *ret_nparams,
@@ -450,7 +449,7 @@ cleanup:
  ************************************************************************/
 
 static PyObject *
-libvirt_virDomainBlockStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virDomainBlockStats(PyObject *self, PyObject *args) {
     virDomainPtr domain;
     PyObject *pyobj_domain;
     char * path;
@@ -482,7 +481,7 @@ libvirt_virDomainBlockStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 static PyObject *
-libvirt_virDomainBlockStatsFlags(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainBlockStatsFlags(PyObject *self,
                                  PyObject *args)
 {
     virDomainPtr domain;
@@ -529,7 +528,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
+libvirt_virDomainGetCPUStats(PyObject *self, PyObject *args)
 {
     virDomainPtr domain;
     PyObject *pyobj_domain, *totalbool;
@@ -665,7 +664,7 @@ error:
 }
 
 static PyObject *
-libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virDomainInterfaceStats(PyObject *self, PyObject *args) {
     virDomainPtr domain;
     PyObject *pyobj_domain;
     char * path;
@@ -700,7 +699,7 @@ libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
 }
 
 static PyObject *
-libvirt_virDomainMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virDomainMemoryStats(PyObject *self, PyObject *args) {
     virDomainPtr domain;
     PyObject *pyobj_domain;
     unsigned int nr_stats;
@@ -751,7 +750,7 @@ libvirt_virDomainMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 static PyObject *
-libvirt_virDomainGetSchedulerType(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainGetSchedulerType(PyObject *self,
                                   PyObject *args) {
     virDomainPtr domain;
     PyObject *pyobj_domain, *info;
@@ -782,7 +781,7 @@ libvirt_virDomainGetSchedulerType(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virDomainGetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainGetSchedulerParameters(PyObject *self,
                                         PyObject *args)
 {
     virDomainPtr domain;
@@ -829,7 +828,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainGetSchedulerParametersFlags(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainGetSchedulerParametersFlags(PyObject *self,
                                         PyObject *args)
 {
     virDomainPtr domain;
@@ -877,7 +876,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainSetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainSetSchedulerParameters(PyObject *self,
                                         PyObject *args)
 {
     virDomainPtr domain;
@@ -951,7 +950,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainSetSchedulerParametersFlags(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainSetSchedulerParametersFlags(PyObject *self,
                                              PyObject *args)
 {
     virDomainPtr domain;
@@ -1027,7 +1026,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainSetBlkioParameters(PyObject *self,
                                     PyObject *args)
 {
     virDomainPtr domain;
@@ -1101,7 +1100,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainGetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainGetBlkioParameters(PyObject *self,
                                     PyObject *args)
 {
     virDomainPtr domain;
@@ -1147,7 +1146,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainSetMemoryParameters(PyObject *self,
                                      PyObject *args)
 {
     virDomainPtr domain;
@@ -1221,7 +1220,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainGetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainGetMemoryParameters(PyObject *self,
                                      PyObject *args)
 {
     virDomainPtr domain;
@@ -1267,7 +1266,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainSetNumaParameters(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainSetNumaParameters(PyObject *self,
                                    PyObject *args)
 {
     virDomainPtr domain;
@@ -1341,7 +1340,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainGetNumaParameters(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainGetNumaParameters(PyObject *self,
                                    PyObject *args)
 {
     virDomainPtr domain;
@@ -1387,7 +1386,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainSetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainSetInterfaceParameters(PyObject *self,
                                         PyObject *args)
 {
     virDomainPtr domain;
@@ -1462,7 +1461,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainGetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainGetInterfaceParameters(PyObject *self,
                                         PyObject *args)
 {
     virDomainPtr domain;
@@ -1509,7 +1508,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainGetVcpus(PyObject *self,
                           PyObject *args)
 {
     virDomainPtr domain;
@@ -1634,7 +1633,7 @@ cleanup:
 
 
 static PyObject *
-libvirt_virDomainPinVcpu(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainPinVcpu(PyObject *self,
                          PyObject *args)
 {
     virDomainPtr domain;
@@ -1698,7 +1697,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainPinVcpuFlags(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainPinVcpuFlags(PyObject *self,
                               PyObject *args)
 {
     virDomainPtr domain;
@@ -1762,7 +1761,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainGetVcpuPinInfo(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainGetVcpuPinInfo(PyObject *self,
                                 PyObject *args) {
     virDomainPtr domain;
     PyObject *pyobj_domain, *pycpumaps = NULL;
@@ -1827,7 +1826,7 @@ cleanup:
 
 
 static PyObject *
-libvirt_virDomainPinEmulator(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainPinEmulator(PyObject *self,
                              PyObject *args)
 {
     virDomainPtr domain;
@@ -1892,7 +1891,7 @@ libvirt_virDomainPinEmulator(PyObject *self ATTRIBUTE_UNUSED,
 
 
 static PyObject *
-libvirt_virDomainGetEmulatorPinInfo(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainGetEmulatorPinInfo(PyObject *self,
                                     PyObject *args)
 {
     virDomainPtr domain;
@@ -1952,7 +1951,7 @@ static PyObject *libvirt_virPythonErrorFuncHandler = NULL;
 static PyObject *libvirt_virPythonErrorFuncCtxt = NULL;
 
 static PyObject *
-libvirt_virGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED)
+libvirt_virGetLastError(PyObject *self, PyObject *args)
 {
     virError *err;
     PyObject *info;
@@ -1976,7 +1975,7 @@ libvirt_virGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUT
 }
 
 static PyObject *
-libvirt_virConnGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
+libvirt_virConnGetLastError(PyObject *self, PyObject *args)
 {
     virError *err;
     PyObject *info;
@@ -2009,7 +2008,7 @@ libvirt_virConnGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
 }
 
 static void
-libvirt_virErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, virErrorPtr err)
+libvirt_virErrorFuncHandler(void *ctx, virErrorPtr err)
 {
     PyObject *list, *info;
     PyObject *result;
@@ -2050,7 +2049,7 @@ libvirt_virErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, virErrorPtr err)
 }
 
 static PyObject *
-libvirt_virRegisterErrorHandler(ATTRIBUTE_UNUSED PyObject * self,
+libvirt_virRegisterErrorHandler(PyObject * self,
                                PyObject * args)
 {
     PyObject *py_retval;
@@ -2172,7 +2171,7 @@ static int virConnectCredCallbackWrapper(virConnectCredentialPtr cred,
 
 
 static PyObject *
-libvirt_virConnectOpenAuth(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virConnectOpenAuth(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     virConnectPtr c_retval;
     char * name;
@@ -2221,7 +2220,7 @@ libvirt_virConnectOpenAuth(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
  ************************************************************************/
 
 static PyObject *
-libvirt_virGetVersion(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
+libvirt_virGetVersion(PyObject *self, PyObject *args)
 {
     char *type = NULL;
     unsigned long libVer, typeVer = 0;
@@ -2249,7 +2248,7 @@ libvirt_virGetVersion(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
 }
 
 static PyObject *
-libvirt_virConnectGetVersion(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectGetVersion(PyObject *self,
                              PyObject *args)
 {
     unsigned long hvVersion;
@@ -2275,7 +2274,7 @@ libvirt_virConnectGetVersion(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virConnectGetLibVersion(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectGetLibVersion(PyObject *self,
                                 PyObject *args)
 {
     unsigned long libVer;
@@ -2301,7 +2300,7 @@ libvirt_virConnectGetLibVersion(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectListDomainsID(PyObject *self,
                                 PyObject *args) {
     PyObject *py_retval;
     int *ids = NULL, c_retval;
@@ -2345,7 +2344,7 @@ libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virConnectListAllDomains(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectListAllDomains(PyObject *self,
                                  PyObject *args)
 {
     PyObject *pyobj_conn;
@@ -2392,7 +2391,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectListDefinedDomains(PyObject *self,
                                      PyObject *args) {
     PyObject *py_retval;
     char **names = NULL;
@@ -2437,7 +2436,7 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virDomainSnapshotListNames(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainSnapshotListNames(PyObject *self,
                                    PyObject *args)
 {
     PyObject *py_retval;
@@ -2494,7 +2493,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainListAllSnapshots(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainListAllSnapshots(PyObject *self,
                                   PyObject *args)
 {
     PyObject *py_retval = NULL;
@@ -2540,7 +2539,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainSnapshotListChildrenNames(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainSnapshotListChildrenNames(PyObject *self,
                                            PyObject *args)
 {
     PyObject *py_retval;
@@ -2595,7 +2594,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainSnapshotListAllChildren(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainSnapshotListAllChildren(PyObject *self,
                                          PyObject *args)
 {
     PyObject *py_retval = NULL;
@@ -2641,7 +2640,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainRevertToSnapshot(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainRevertToSnapshot(PyObject *self,
                                   PyObject *args) {
     int c_retval;
     virDomainSnapshotPtr snap;
@@ -2663,7 +2662,7 @@ libvirt_virDomainRevertToSnapshot(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virDomainGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virDomainGetInfo(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     virDomainPtr domain;
@@ -2690,7 +2689,7 @@ libvirt_virDomainGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 static PyObject *
-libvirt_virDomainGetState(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
+libvirt_virDomainGetState(PyObject *self, PyObject *args)
 {
     PyObject *py_retval;
     int c_retval;
@@ -2719,7 +2718,7 @@ libvirt_virDomainGetState(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
 }
 
 static PyObject *
-libvirt_virDomainGetControlInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virDomainGetControlInfo(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     virDomainPtr domain;
@@ -2745,7 +2744,7 @@ libvirt_virDomainGetControlInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
 }
 
 static PyObject *
-libvirt_virDomainGetBlockInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virDomainGetBlockInfo(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     virDomainPtr domain;
@@ -2771,7 +2770,7 @@ libvirt_virDomainGetBlockInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 static PyObject *
-libvirt_virNodeGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virNodeGetInfo(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     virConnectPtr conn;
@@ -2800,7 +2799,7 @@ libvirt_virNodeGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 static PyObject *
-libvirt_virDomainGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virDomainGetUUID(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     unsigned char uuid[VIR_UUID_BUFLEN];
     virDomainPtr domain;
@@ -2825,7 +2824,7 @@ libvirt_virDomainGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 static PyObject *
-libvirt_virDomainGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainGetUUIDString(PyObject *self,
                                PyObject *args) {
     PyObject *py_retval;
     char uuidstr[VIR_UUID_STRING_BUFLEN];
@@ -2852,7 +2851,7 @@ libvirt_virDomainGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virDomainLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virDomainLookupByUUID(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     virDomainPtr c_retval;
     virConnectPtr conn;
@@ -2876,7 +2875,7 @@ libvirt_virDomainLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 
 
 static PyObject *
-libvirt_virConnectListNetworks(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectListNetworks(PyObject *self,
                                PyObject *args) {
     PyObject *py_retval;
     char **names = NULL;
@@ -2922,7 +2921,7 @@ libvirt_virConnectListNetworks(PyObject *self ATTRIBUTE_UNUSED,
 
 
 static PyObject *
-libvirt_virConnectListDefinedNetworks(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectListDefinedNetworks(PyObject *self,
                                       PyObject *args) {
     PyObject *py_retval;
     char **names = NULL;
@@ -2967,7 +2966,7 @@ libvirt_virConnectListDefinedNetworks(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virConnectListAllNetworks(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectListAllNetworks(PyObject *self,
                                   PyObject *args)
 {
     PyObject *pyobj_conn;
@@ -3015,7 +3014,7 @@ cleanup:
 
 
 static PyObject *
-libvirt_virNetworkGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virNetworkGetUUID(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     unsigned char uuid[VIR_UUID_BUFLEN];
     virNetworkPtr domain;
@@ -3040,7 +3039,7 @@ libvirt_virNetworkGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 static PyObject *
-libvirt_virNetworkGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virNetworkGetUUIDString(PyObject *self,
                                 PyObject *args) {
     PyObject *py_retval;
     char uuidstr[VIR_UUID_STRING_BUFLEN];
@@ -3067,7 +3066,7 @@ libvirt_virNetworkGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virNetworkLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virNetworkLookupByUUID(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     virNetworkPtr c_retval;
     virConnectPtr conn;
@@ -3091,7 +3090,7 @@ libvirt_virNetworkLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
 
 
 static PyObject *
-libvirt_virDomainGetAutostart(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virDomainGetAutostart(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     int c_retval, autostart;
     virDomainPtr domain;
@@ -3114,7 +3113,7 @@ libvirt_virDomainGetAutostart(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 
 
 static PyObject *
-libvirt_virNetworkGetAutostart(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virNetworkGetAutostart(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     int c_retval, autostart;
     virNetworkPtr network;
@@ -3136,7 +3135,7 @@ libvirt_virNetworkGetAutostart(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
 }
 
 static PyObject *
-libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
+libvirt_virNodeGetCellsFreeMemory(PyObject *self, PyObject *args)
 {
     PyObject *py_retval;
     PyObject *pyobj_conn;
@@ -3173,7 +3172,7 @@ libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *arg
 }
 
 static PyObject *
-libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
+libvirt_virNodeGetCPUStats(PyObject *self, PyObject *args)
 {
     PyObject *ret = NULL;
     PyObject *key = NULL;
@@ -3237,7 +3236,7 @@ error:
 }
 
 static PyObject *
-libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
+libvirt_virNodeGetMemoryStats(PyObject *self, PyObject *args)
 {
     PyObject *ret = NULL;
     PyObject *key = NULL;
@@ -3301,7 +3300,7 @@ error:
 }
 
 static PyObject *
-libvirt_virConnectListStoragePools(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectListStoragePools(PyObject *self,
                                    PyObject *args) {
     PyObject *py_retval;
     char **names = NULL;
@@ -3355,7 +3354,7 @@ libvirt_virConnectListStoragePools(PyObject *self ATTRIBUTE_UNUSED,
 
 
 static PyObject *
-libvirt_virConnectListDefinedStoragePools(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectListDefinedStoragePools(PyObject *self,
                                           PyObject *args) {
     PyObject *py_retval;
     char **names = NULL;
@@ -3408,7 +3407,7 @@ libvirt_virConnectListDefinedStoragePools(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virConnectListAllStoragePools(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectListAllStoragePools(PyObject *self,
                                       PyObject *args)
 {
     PyObject *pyobj_conn;
@@ -3455,7 +3454,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virStoragePoolListVolumes(PyObject *self,
                                   PyObject *args) {
     PyObject *py_retval;
     char **names = NULL;
@@ -3508,7 +3507,7 @@ libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virStoragePoolListAllVolumes(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virStoragePoolListAllVolumes(PyObject *self,
                                      PyObject *args)
 {
     PyObject *py_retval = NULL;
@@ -3557,7 +3556,7 @@ cleanup:
 
 
 static PyObject *
-libvirt_virStoragePoolGetAutostart(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virStoragePoolGetAutostart(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     int c_retval, autostart;
     virStoragePoolPtr pool;
@@ -3580,7 +3579,7 @@ libvirt_virStoragePoolGetAutostart(PyObject *self ATTRIBUTE_UNUSED, PyObject *ar
 }
 
 static PyObject *
-libvirt_virStoragePoolGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virStoragePoolGetInfo(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     virStoragePoolPtr pool;
@@ -3612,7 +3611,7 @@ libvirt_virStoragePoolGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 
 
 static PyObject *
-libvirt_virStorageVolGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virStorageVolGetInfo(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     virStorageVolPtr pool;
@@ -3640,7 +3639,7 @@ libvirt_virStorageVolGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 static PyObject *
-libvirt_virStoragePoolGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virStoragePoolGetUUID(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     unsigned char uuid[VIR_UUID_BUFLEN];
     virStoragePoolPtr pool;
@@ -3666,7 +3665,7 @@ libvirt_virStoragePoolGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 static PyObject *
-libvirt_virStoragePoolGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virStoragePoolGetUUIDString(PyObject *self,
                                     PyObject *args) {
     PyObject *py_retval;
     char uuidstr[VIR_UUID_STRING_BUFLEN];
@@ -3692,7 +3691,7 @@ libvirt_virStoragePoolGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virStoragePoolLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virStoragePoolLookupByUUID(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     virStoragePoolPtr c_retval;
     virConnectPtr conn;
@@ -3715,7 +3714,7 @@ libvirt_virStoragePoolLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *ar
 }
 
 static PyObject *
-libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virNodeListDevices(PyObject *self,
                            PyObject *args) {
     PyObject *py_retval;
     char **names = NULL;
@@ -3762,7 +3761,7 @@ libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virConnectListAllNodeDevices(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectListAllNodeDevices(PyObject *self,
                                      PyObject *args)
 {
     PyObject *pyobj_conn;
@@ -3809,7 +3808,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virNodeDeviceListCaps(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virNodeDeviceListCaps(PyObject *self,
                               PyObject *args) {
     PyObject *py_retval;
     char **names = NULL;
@@ -3853,7 +3852,7 @@ libvirt_virNodeDeviceListCaps(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virSecretGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virSecretGetUUID(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     unsigned char uuid[VIR_UUID_BUFLEN];
     virSecretPtr secret;
@@ -3878,7 +3877,7 @@ libvirt_virSecretGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 static PyObject *
-libvirt_virSecretGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virSecretGetUUIDString(PyObject *self,
                                PyObject *args) {
     PyObject *py_retval;
     char uuidstr[VIR_UUID_STRING_BUFLEN];
@@ -3905,7 +3904,7 @@ libvirt_virSecretGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virSecretLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virSecretLookupByUUID(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     virSecretPtr c_retval;
     virConnectPtr conn;
@@ -3929,7 +3928,7 @@ libvirt_virSecretLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 
 
 static PyObject *
-libvirt_virConnectListSecrets(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectListSecrets(PyObject *self,
                               PyObject *args) {
     PyObject *py_retval;
     char **uuids = NULL;
@@ -3973,7 +3972,7 @@ libvirt_virConnectListSecrets(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virConnectListAllSecrets(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectListAllSecrets(PyObject *self,
                                  PyObject *args)
 {
     PyObject *pyobj_conn;
@@ -4020,7 +4019,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virSecretGetValue(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virSecretGetValue(PyObject *self,
                           PyObject *args) {
     PyObject *py_retval;
     unsigned char *c_retval;
@@ -4048,7 +4047,7 @@ libvirt_virSecretGetValue(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virSecretSetValue(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virSecretSetValue(PyObject *self,
                           PyObject *args) {
     PyObject *py_retval;
     int c_retval;
@@ -4073,7 +4072,7 @@ libvirt_virSecretSetValue(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virNWFilterGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virNWFilterGetUUID(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     unsigned char uuid[VIR_UUID_BUFLEN];
     virNWFilterPtr nwfilter;
@@ -4098,7 +4097,7 @@ libvirt_virNWFilterGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 static PyObject *
-libvirt_virNWFilterGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virNWFilterGetUUIDString(PyObject *self,
                                  PyObject *args) {
     PyObject *py_retval;
     char uuidstr[VIR_UUID_STRING_BUFLEN];
@@ -4125,7 +4124,7 @@ libvirt_virNWFilterGetUUIDString(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virNWFilterLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virNWFilterLookupByUUID(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     virNWFilterPtr c_retval;
     virConnectPtr conn;
@@ -4149,7 +4148,7 @@ libvirt_virNWFilterLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
 
 
 static PyObject *
-libvirt_virConnectListNWFilters(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectListNWFilters(PyObject *self,
                                 PyObject *args) {
     PyObject *py_retval;
     char **uuids = NULL;
@@ -4193,7 +4192,7 @@ libvirt_virConnectListNWFilters(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virConnectListAllNWFilters(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectListAllNWFilters(PyObject *self,
                                    PyObject *args)
 {
     PyObject *pyobj_conn;
@@ -4240,7 +4239,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectListInterfaces(PyObject *self,
                                  PyObject *args) {
     PyObject *py_retval;
     char **names = NULL;
@@ -4294,7 +4293,7 @@ libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED,
 
 
 static PyObject *
-libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectListDefinedInterfaces(PyObject *self,
                                         PyObject *args) {
     PyObject *py_retval;
     char **names = NULL;
@@ -4349,7 +4348,7 @@ libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED,
 
 
 static PyObject *
-libvirt_virConnectListAllInterfaces(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectListAllInterfaces(PyObject *self,
                                     PyObject *args)
 {
     PyObject *pyobj_conn;
@@ -4396,7 +4395,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virConnectBaselineCPU(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virConnectBaselineCPU(PyObject *self,
                               PyObject *args) {
     PyObject *pyobj_conn;
     PyObject *list;
@@ -4448,7 +4447,7 @@ libvirt_virConnectBaselineCPU(PyObject *self ATTRIBUTE_UNUSED,
 
 
 static PyObject *
-libvirt_virDomainGetJobInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virDomainGetJobInfo(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     virDomainPtr domain;
@@ -4482,7 +4481,7 @@ libvirt_virDomainGetJobInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
 }
 
 static PyObject *
-libvirt_virDomainGetJobStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
+libvirt_virDomainGetJobStats(PyObject *self, PyObject *args)
 {
     PyObject *pyobj_domain;
     virDomainPtr domain;
@@ -4523,7 +4522,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainGetBlockJobInfo(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainGetBlockJobInfo(PyObject *self,
                                  PyObject *args)
 {
     virDomainPtr domain;
@@ -4586,7 +4585,7 @@ error:
 }
 
 static PyObject *
-libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainSetBlockIoTune(PyObject *self,
                                 PyObject *args)
 {
     virDomainPtr domain;
@@ -4660,7 +4659,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainGetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainGetBlockIoTune(PyObject *self,
                                 PyObject *args)
 {
     virDomainPtr domain;
@@ -4707,7 +4706,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainGetDiskErrors(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainGetDiskErrors(PyObject *self,
                                PyObject *args)
 {
     PyObject *py_retval = VIR_PY_NONE;
@@ -4847,7 +4846,7 @@ libvirt_lookupPythonFunc(const char *funcname)
  *******************************************/
 
 static int
-libvirt_virConnectDomainEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
+libvirt_virConnectDomainEventCallback(virConnectPtr conn,
                                       virDomainPtr dom,
                                       int event,
                                       int detail,
@@ -4924,7 +4923,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virConnectDomainEventRegister(ATTRIBUTE_UNUSED PyObject * self,
+libvirt_virConnectDomainEventRegister(PyObject * self,
                                       PyObject * args)
 {
     PyObject *py_retval;        /* return value */
@@ -4960,7 +4959,7 @@ libvirt_virConnectDomainEventRegister(ATTRIBUTE_UNUSED PyObject * self,
 }
 
 static PyObject *
-libvirt_virConnectDomainEventDeregister(ATTRIBUTE_UNUSED PyObject * self,
+libvirt_virConnectDomainEventDeregister(PyObject * self,
                                         PyObject * args)
 {
     PyObject *py_retval;
@@ -5259,7 +5258,7 @@ libvirt_virEventRemoveTimeoutFunc(int timer)
 }
 
 static PyObject *
-libvirt_virEventRegisterImpl(ATTRIBUTE_UNUSED PyObject * self,
+libvirt_virEventRegisterImpl(PyObject * self,
                              PyObject * args)
 {
     /* Unref the previously-registered impl (if any) */
@@ -5319,7 +5318,7 @@ libvirt_virEventRegisterImpl(ATTRIBUTE_UNUSED PyObject * self,
 }
 
 static PyObject *
-libvirt_virEventInvokeHandleCallback(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virEventInvokeHandleCallback(PyObject *self,
                                      PyObject *args)
 {
     int watch, fd, event;
@@ -5347,7 +5346,7 @@ libvirt_virEventInvokeHandleCallback(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virEventInvokeTimeoutCallback(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virEventInvokeTimeoutCallback(PyObject *self,
                                       PyObject *args)
 {
     int timer;
@@ -5412,7 +5411,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virEventAddHandle(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virEventAddHandle(PyObject *self,
                           PyObject *args)
 {
     PyObject *py_retval;
@@ -5479,7 +5478,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virEventAddTimeout(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virEventAddTimeout(PyObject *self,
                            PyObject *args)
 {
     PyObject *py_retval;
@@ -5518,7 +5517,7 @@ libvirt_virConnectDomainEventFreeFunc(void *opaque)
 }
 
 static int
-libvirt_virConnectDomainEventLifecycleCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
+libvirt_virConnectDomainEventLifecycleCallback(virConnectPtr conn,
                                                virDomainPtr dom,
                                                int event,
                                                int detail,
@@ -5566,7 +5565,7 @@ libvirt_virConnectDomainEventLifecycleCallback(virConnectPtr conn ATTRIBUTE_UNUS
 }
 
 static int
-libvirt_virConnectDomainEventGenericCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
+libvirt_virConnectDomainEventGenericCallback(virConnectPtr conn,
                                              virDomainPtr dom,
                                              void *opaque)
 {
@@ -5610,7 +5609,7 @@ libvirt_virConnectDomainEventGenericCallback(virConnectPtr conn ATTRIBUTE_UNUSED
 }
 
 static int
-libvirt_virConnectDomainEventRTCChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
+libvirt_virConnectDomainEventRTCChangeCallback(virConnectPtr conn,
                                                virDomainPtr dom,
                                                long long utcoffset,
                                                void *opaque)
@@ -5657,7 +5656,7 @@ libvirt_virConnectDomainEventRTCChangeCallback(virConnectPtr conn ATTRIBUTE_UNUS
 }
 
 static int
-libvirt_virConnectDomainEventWatchdogCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
+libvirt_virConnectDomainEventWatchdogCallback(virConnectPtr conn,
                                               virDomainPtr dom,
                                               int action,
                                               void *opaque)
@@ -5704,7 +5703,7 @@ libvirt_virConnectDomainEventWatchdogCallback(virConnectPtr conn ATTRIBUTE_UNUSE
 }
 
 static int
-libvirt_virConnectDomainEventIOErrorCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
+libvirt_virConnectDomainEventIOErrorCallback(virConnectPtr conn,
                                              virDomainPtr dom,
                                              const char *srcPath,
                                              const char *devAlias,
@@ -5753,7 +5752,7 @@ libvirt_virConnectDomainEventIOErrorCallback(virConnectPtr conn ATTRIBUTE_UNUSED
 }
 
 static int
-libvirt_virConnectDomainEventIOErrorReasonCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
+libvirt_virConnectDomainEventIOErrorReasonCallback(virConnectPtr conn,
                                                    virDomainPtr dom,
                                                    const char *srcPath,
                                                    const char *devAlias,
@@ -5803,7 +5802,7 @@ libvirt_virConnectDomainEventIOErrorReasonCallback(virConnectPtr conn ATTRIBUTE_
 }
 
 static int
-libvirt_virConnectDomainEventGraphicsCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
+libvirt_virConnectDomainEventGraphicsCallback(virConnectPtr conn,
                                               virDomainPtr dom,
                                               int phase,
                                               virDomainEventGraphicsAddressPtr local,
@@ -5890,7 +5889,7 @@ libvirt_virConnectDomainEventGraphicsCallback(virConnectPtr conn ATTRIBUTE_UNUSE
 }
 
 static int
-libvirt_virConnectDomainEventBlockJobCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
+libvirt_virConnectDomainEventBlockJobCallback(virConnectPtr conn,
                                               virDomainPtr dom,
                                               const char *path,
                                               int type,
@@ -5939,7 +5938,7 @@ libvirt_virConnectDomainEventBlockJobCallback(virConnectPtr conn ATTRIBUTE_UNUSE
 }
 
 static int
-libvirt_virConnectDomainEventDiskChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
+libvirt_virConnectDomainEventDiskChangeCallback(virConnectPtr conn,
                                                 virDomainPtr dom,
                                                 const char *oldSrcPath,
                                                 const char *newSrcPath,
@@ -5989,7 +5988,7 @@ libvirt_virConnectDomainEventDiskChangeCallback(virConnectPtr conn ATTRIBUTE_UNU
 }
 
 static int
-libvirt_virConnectDomainEventTrayChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
+libvirt_virConnectDomainEventTrayChangeCallback(virConnectPtr conn,
                                                 virDomainPtr dom,
                                                 const char *devAlias,
                                                 int reason,
@@ -6036,7 +6035,7 @@ libvirt_virConnectDomainEventTrayChangeCallback(virConnectPtr conn ATTRIBUTE_UNU
 }
 
 static int
-libvirt_virConnectDomainEventPMWakeupCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
+libvirt_virConnectDomainEventPMWakeupCallback(virConnectPtr conn,
                                               virDomainPtr dom,
                                               int reason,
                                               void *opaque)
@@ -6083,7 +6082,7 @@ libvirt_virConnectDomainEventPMWakeupCallback(virConnectPtr conn ATTRIBUTE_UNUSE
 }
 
 static int
-libvirt_virConnectDomainEventPMSuspendCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
+libvirt_virConnectDomainEventPMSuspendCallback(virConnectPtr conn,
                                                virDomainPtr dom,
                                                int reason,
                                                void *opaque)
@@ -6130,7 +6129,7 @@ libvirt_virConnectDomainEventPMSuspendCallback(virConnectPtr conn ATTRIBUTE_UNUS
 }
 
 static int
-libvirt_virConnectDomainEventBalloonChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
+libvirt_virConnectDomainEventBalloonChangeCallback(virConnectPtr conn,
                                                    virDomainPtr dom,
                                                    unsigned long long actual,
                                                    void *opaque)
@@ -6177,7 +6176,7 @@ libvirt_virConnectDomainEventBalloonChangeCallback(virConnectPtr conn ATTRIBUTE_
 }
 
 static int
-libvirt_virConnectDomainEventPMSuspendDiskCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
+libvirt_virConnectDomainEventPMSuspendDiskCallback(virConnectPtr conn,
                                                    virDomainPtr dom,
                                                    int reason,
                                                    void *opaque)
@@ -6224,7 +6223,7 @@ libvirt_virConnectDomainEventPMSuspendDiskCallback(virConnectPtr conn ATTRIBUTE_
 }
 
 static int
-libvirt_virConnectDomainEventDeviceRemovedCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
+libvirt_virConnectDomainEventDeviceRemovedCallback(virConnectPtr conn,
                                                    virDomainPtr dom,
                                                    const char *devAlias,
                                                    void *opaque)
@@ -6269,7 +6268,7 @@ libvirt_virConnectDomainEventDeviceRemovedCallback(virConnectPtr conn ATTRIBUTE_
 }
 
 static PyObject *
-libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject * self,
+libvirt_virConnectDomainEventRegisterAny(PyObject * self,
                                          PyObject * args)
 {
     PyObject *py_retval;        /* return value */
@@ -6371,7 +6370,7 @@ libvirt_virConnectDomainEventRegisterAny(ATTRIBUTE_UNUSED PyObject * self,
 }
 
 static PyObject *
-libvirt_virConnectDomainEventDeregisterAny(ATTRIBUTE_UNUSED PyObject * self,
+libvirt_virConnectDomainEventDeregisterAny(PyObject * self,
                                            PyObject * args)
 {
     PyObject *py_retval;
@@ -6400,7 +6399,7 @@ libvirt_virConnectDomainEventDeregisterAny(ATTRIBUTE_UNUSED PyObject * self,
 
 
 static void
-libvirt_virConnectCloseCallbackDispatch(virConnectPtr conn ATTRIBUTE_UNUSED,
+libvirt_virConnectCloseCallbackDispatch(virConnectPtr conn,
                                         int reason,
                                         void *opaque)
 {
@@ -6437,7 +6436,7 @@ libvirt_virConnectCloseCallbackDispatch(virConnectPtr conn ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virConnectRegisterCloseCallback(ATTRIBUTE_UNUSED PyObject * self,
+libvirt_virConnectRegisterCloseCallback(PyObject * self,
                                         PyObject * args)
 {
     PyObject *py_retval;        /* return value */
@@ -6475,7 +6474,7 @@ libvirt_virConnectRegisterCloseCallback(ATTRIBUTE_UNUSED PyObject * self,
 }
 
 static PyObject *
-libvirt_virConnectUnregisterCloseCallback(ATTRIBUTE_UNUSED PyObject * self,
+libvirt_virConnectUnregisterCloseCallback(PyObject * self,
                                           PyObject * args)
 {
     PyObject *py_retval;
@@ -6513,7 +6512,7 @@ libvirt_virStreamEventFreeFunc(void *opaque)
 }
 
 static void
-libvirt_virStreamEventCallback(virStreamPtr st ATTRIBUTE_UNUSED,
+libvirt_virStreamEventCallback(virStreamPtr st,
                                int events,
                                void *opaque)
 {
@@ -6548,7 +6547,7 @@ libvirt_virStreamEventCallback(virStreamPtr st ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virStreamEventAddCallback(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virStreamEventAddCallback(PyObject *self,
                                   PyObject *args)
 {
     PyObject *py_retval;
@@ -6585,7 +6584,7 @@ libvirt_virStreamEventAddCallback(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virStreamRecv(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virStreamRecv(PyObject *self,
                       PyObject *args)
 {
     PyObject *pyobj_stream;
@@ -6619,7 +6618,7 @@ libvirt_virStreamRecv(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virStreamSend(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virStreamSend(PyObject *self,
                       PyObject *args)
 {
     PyObject *py_retval;
@@ -6648,7 +6647,7 @@ libvirt_virStreamSend(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virDomainSendKey(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainSendKey(PyObject *self,
                          PyObject *args)
 {
     PyObject *py_retval;
@@ -6695,7 +6694,7 @@ libvirt_virDomainSendKey(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virDomainMigrateGetCompressionCache(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainMigrateGetCompressionCache(PyObject *self,
                                             PyObject *args)
 {
     PyObject *pyobj_domain;
@@ -6722,7 +6721,7 @@ libvirt_virDomainMigrateGetCompressionCache(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virDomainMigrateGetMaxSpeed(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virDomainMigrateGetMaxSpeed(PyObject *self, PyObject *args) {
     PyObject *py_retval;
     int c_retval;
     unsigned long bandwidth;
@@ -6747,7 +6746,7 @@ libvirt_virDomainMigrateGetMaxSpeed(PyObject *self ATTRIBUTE_UNUSED, PyObject *a
 }
 
 static PyObject *
-libvirt_virDomainMigrate3(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainMigrate3(PyObject *self,
                           PyObject *args)
 {
     PyObject *pyobj_domain;
@@ -6779,7 +6778,7 @@ libvirt_virDomainMigrate3(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virDomainMigrateToURI3(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainMigrateToURI3(PyObject *self,
                                PyObject *args)
 {
     PyObject *pyobj_domain;
@@ -6809,7 +6808,7 @@ libvirt_virDomainMigrateToURI3(PyObject *self ATTRIBUTE_UNUSED,
 }
 
 static PyObject *
-libvirt_virDomainBlockPeek(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainBlockPeek(PyObject *self,
                            PyObject *args) {
     PyObject *py_retval = NULL;
     int c_retval;
@@ -6847,7 +6846,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virDomainMemoryPeek(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virDomainMemoryPeek(PyObject *self,
                             PyObject *args) {
     PyObject *py_retval = NULL;
     int c_retval;
@@ -6884,7 +6883,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virNodeSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virNodeSetMemoryParameters(PyObject *self,
                                    PyObject *args)
 {
     virConnectPtr conn;
@@ -6958,7 +6957,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virNodeGetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virNodeGetMemoryParameters(PyObject *self,
                                    PyObject *args)
 {
     virConnectPtr conn;
@@ -7004,7 +7003,7 @@ cleanup:
 }
 
 static PyObject *
-libvirt_virNodeGetCPUMap(PyObject *self ATTRIBUTE_UNUSED,
+libvirt_virNodeGetCPUMap(PyObject *self,
                          PyObject *args)
 {
     virConnectPtr conn;
@@ -7074,7 +7073,7 @@ error:
 
 
 static PyObject *
-libvirt_virDomainCreateWithFiles(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virDomainCreateWithFiles(PyObject *self, PyObject *args) {
     PyObject *py_retval = NULL;
     int c_retval;
     virDomainPtr domain;
@@ -7117,7 +7116,7 @@ cleanup:
 
 
 static PyObject *
-libvirt_virDomainCreateXMLWithFiles(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+libvirt_virDomainCreateXMLWithFiles(PyObject *self, PyObject *args) {
     PyObject *py_retval = NULL;
     virDomainPtr c_retval;
     virConnectPtr conn;
-- 
cgit