viralloc: Report OOM error on failure

Similarly to VIR_STRDUP, we want the OOM error to be reported in
VIR_ALLOC and friends.

diff --git a/po/POTFILES.in b/po/POTFILES.in
index af7fd7fbe39c8d7f6b0873236c4d633dd5d0dda1..0b6576505f38cc87d632432d173f6ca0e608b25e 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -141,6 +141,7 @@ src/test/test_driver.c
 src/uml/uml_conf.c
 src/uml/uml_driver.c
 src/util/iohelper.c
+src/util/viralloc.c
 src/util/viraudit.c
 src/util/virauth.c
 src/util/virauthconfig.c

diff --git a/python/libvirt-override.c b/python/libvirt-override.c
index 5c5586d4726c839d6bff21f6b39707d7450ca896..6b6e77b8c3a1f1ceb22338a7d493798d3b87b728 100644 (file)
--- a/python/libvirt-override.c
+++ b/python/libvirt-override.c
@@ -171,7 +171,7 @@ setPyVirTypedParameter(PyObject *info,
         return NULL;
     }
 
-    if (VIR_ALLOC_N(ret, size) < 0) {
+    if (VIR_ALLOC_N_QUIET(ret, size) < 0) {
         PyErr_NoMemory();
         return NULL;
     }
@@ -511,7 +511,7 @@ libvirt_virDomainBlockStatsFlags(PyObject *self ATTRIBUTE_UNUSED,
     if (!nparams)
         return PyDict_New();
 
-    if (VIR_ALLOC_N(params, nparams) < 0)
+    if (VIR_ALLOC_N_QUIET(params, nparams) < 0)
         return PyErr_NoMemory();
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -577,7 +577,7 @@ libvirt_virDomainGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
 
         sumparams = nparams * MIN(ncpus, 128);
 
-        if (VIR_ALLOC_N(params, sumparams) < 0) {
+        if (VIR_ALLOC_N_QUIET(params, sumparams) < 0) {
             error = PyErr_NoMemory();
             goto error;
         }
@@ -629,7 +629,7 @@ libvirt_virDomainGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
         if (nparams) {
             sumparams = nparams;
 
-            if (VIR_ALLOC_N(params, nparams) < 0) {
+            if (VIR_ALLOC_N_QUIET(params, nparams) < 0) {
                 error = PyErr_NoMemory();
                 goto error;
             }
@@ -809,7 +809,7 @@ libvirt_virDomainGetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED,
     if (!nparams)
         return PyDict_New();
 
-    if (VIR_ALLOC_N(params, nparams) < 0)
+    if (VIR_ALLOC_N_QUIET(params, nparams) < 0)
         return PyErr_NoMemory();
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -857,7 +857,7 @@ libvirt_virDomainGetSchedulerParametersFlags(PyObject *self ATTRIBUTE_UNUSED,
     if (!nparams)
         return PyDict_New();
 
-    if (VIR_ALLOC_N(params, nparams) < 0)
+    if (VIR_ALLOC_N_QUIET(params, nparams) < 0)
         return PyErr_NoMemory();
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -917,7 +917,7 @@ libvirt_virDomainSetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED,
         return NULL;
     }
 
-    if (VIR_ALLOC_N(params, nparams) < 0)
+    if (VIR_ALLOC_N_QUIET(params, nparams) < 0)
         return PyErr_NoMemory();
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -993,7 +993,7 @@ libvirt_virDomainSetSchedulerParametersFlags(PyObject *self ATTRIBUTE_UNUSED,
         return NULL;
     }
 
-    if (VIR_ALLOC_N(params, nparams) < 0)
+    if (VIR_ALLOC_N_QUIET(params, nparams) < 0)
         return PyErr_NoMemory();
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -1067,7 +1067,7 @@ libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED,
         return NULL;
     }
 
-    if (VIR_ALLOC_N(params, nparams) < 0)
+    if (VIR_ALLOC_N_QUIET(params, nparams) < 0)
         return PyErr_NoMemory();
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -1127,7 +1127,7 @@ libvirt_virDomainGetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED,
     if (!nparams)
         return PyDict_New();
 
-    if (VIR_ALLOC_N(params, nparams) < 0)
+    if (VIR_ALLOC_N_QUIET(params, nparams) < 0)
         return PyErr_NoMemory();
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -1187,7 +1187,7 @@ libvirt_virDomainSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED,
         return NULL;
     }
 
-    if (VIR_ALLOC_N(params, nparams) < 0)
+    if (VIR_ALLOC_N_QUIET(params, nparams) < 0)
         return PyErr_NoMemory();
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -1247,7 +1247,7 @@ libvirt_virDomainGetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED,
     if (!nparams)
         return PyDict_New();
 
-    if (VIR_ALLOC_N(params, nparams) < 0)
+    if (VIR_ALLOC_N_QUIET(params, nparams) < 0)
         return PyErr_NoMemory();
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -1307,7 +1307,7 @@ libvirt_virDomainSetNumaParameters(PyObject *self ATTRIBUTE_UNUSED,
         return NULL;
     }
 
-    if (VIR_ALLOC_N(params, nparams) < 0)
+    if (VIR_ALLOC_N_QUIET(params, nparams) < 0)
         return PyErr_NoMemory();
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -1367,7 +1367,7 @@ libvirt_virDomainGetNumaParameters(PyObject *self ATTRIBUTE_UNUSED,
     if (!nparams)
         return PyDict_New();
 
-    if (VIR_ALLOC_N(params, nparams) < 0)
+    if (VIR_ALLOC_N_QUIET(params, nparams) < 0)
         return PyErr_NoMemory();
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -1428,7 +1428,7 @@ libvirt_virDomainSetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED,
         return NULL;
     }
 
-    if (VIR_ALLOC_N(params, nparams) < 0)
+    if (VIR_ALLOC_N_QUIET(params, nparams) < 0)
         return PyErr_NoMemory();
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -1489,7 +1489,7 @@ libvirt_virDomainGetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED,
     if (!nparams)
         return PyDict_New();
 
-    if (VIR_ALLOC_N(params, nparams) < 0)
+    if (VIR_ALLOC_N_QUIET(params, nparams) < 0)
         return PyErr_NoMemory();
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -1535,12 +1535,12 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED,
     if (i_retval < 0)
         return VIR_PY_INT_FAIL;
 
-    if (VIR_ALLOC_N(cpuinfo, dominfo.nrVirtCpu) < 0)
+    if (VIR_ALLOC_N_QUIET(cpuinfo, dominfo.nrVirtCpu) < 0)
         return PyErr_NoMemory();
 
     cpumaplen = VIR_CPU_MAPLEN(cpunum);
     if (xalloc_oversized(dominfo.nrVirtCpu, cpumaplen) ||
-        VIR_ALLOC_N(cpumap, dominfo.nrVirtCpu * cpumaplen) < 0) {
+        VIR_ALLOC_N_QUIET(cpumap, dominfo.nrVirtCpu * cpumaplen) < 0) {
         error = PyErr_NoMemory();
         goto cleanup;
     }
@@ -1662,7 +1662,7 @@ libvirt_virDomainPinVcpu(PyObject *self ATTRIBUTE_UNUSED,
     }
 
     cpumaplen = VIR_CPU_MAPLEN(cpunum);
-    if (VIR_ALLOC_N(cpumap, cpumaplen) < 0)
+    if (VIR_ALLOC_N_QUIET(cpumap, cpumaplen) < 0)
         return PyErr_NoMemory();
 
     for (i = 0; i < tuple_size; i++) {
@@ -1726,7 +1726,7 @@ libvirt_virDomainPinVcpuFlags(PyObject *self ATTRIBUTE_UNUSED,
     }
 
     cpumaplen = VIR_CPU_MAPLEN(cpunum);
-    if (VIR_ALLOC_N(cpumap, cpumaplen) < 0)
+    if (VIR_ALLOC_N_QUIET(cpumap, cpumaplen) < 0)
         return PyErr_NoMemory();
 
     for (i = 0; i < tuple_size; i++) {
@@ -1786,7 +1786,7 @@ libvirt_virDomainGetVcpuPinInfo(PyObject *self ATTRIBUTE_UNUSED,
 
     cpumaplen = VIR_CPU_MAPLEN(cpunum);
     if (xalloc_oversized(dominfo.nrVirtCpu, cpumaplen) ||
-        VIR_ALLOC_N(cpumaps, dominfo.nrVirtCpu * cpumaplen) < 0)
+        VIR_ALLOC_N_QUIET(cpumaps, dominfo.nrVirtCpu * cpumaplen) < 0)
         goto cleanup;
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -1854,7 +1854,7 @@ libvirt_virDomainPinEmulator(PyObject *self ATTRIBUTE_UNUSED,
     if ((tuple_size = PyTuple_Size(pycpumap)) == -1)
         return NULL;
 
-    if (VIR_ALLOC_N(cpumap, cpumaplen) < 0)
+    if (VIR_ALLOC_N_QUIET(cpumap, cpumaplen) < 0)
         return PyErr_NoMemory();
 
     for (i = 0; i < tuple_size; i++) {
@@ -1913,7 +1913,7 @@ libvirt_virDomainGetEmulatorPinInfo(PyObject *self ATTRIBUTE_UNUSED,
 
     cpumaplen = VIR_CPU_MAPLEN(cpunum);
 
-    if (VIR_ALLOC_N(cpumap, cpumaplen) < 0)
+    if (VIR_ALLOC_N_QUIET(cpumap, cpumaplen) < 0)
         return PyErr_NoMemory();
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -2188,7 +2188,7 @@ libvirt_virConnectOpenAuth(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
     auth.ncredtype = PyList_Size(pycredtype);
     if (auth.ncredtype) {
         int i;
-        if (VIR_ALLOC_N(auth.credtype, auth.ncredtype) < 0)
+        if (VIR_ALLOC_N_QUIET(auth.credtype, auth.ncredtype) < 0)
             return VIR_PY_NONE;
         for (i = 0; i < auth.ncredtype; i++) {
             PyObject *val;
@@ -2316,7 +2316,7 @@ libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED,
         return VIR_PY_NONE;
 
     if (c_retval) {
-        if (VIR_ALLOC_N(ids, c_retval) < 0)
+        if (VIR_ALLOC_N_QUIET(ids, c_retval) < 0)
             return VIR_PY_NONE;
 
         LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -2407,7 +2407,7 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED,
         return VIR_PY_NONE;
 
     if (c_retval) {
-        if (VIR_ALLOC_N(names, c_retval) < 0)
+        if (VIR_ALLOC_N_QUIET(names, c_retval) < 0)
             return VIR_PY_NONE;
         LIBVIRT_BEGIN_ALLOW_THREADS;
         c_retval = virConnectListDefinedDomains(conn, names, c_retval);
@@ -2454,7 +2454,7 @@ libvirt_virDomainSnapshotListNames(PyObject *self ATTRIBUTE_UNUSED,
         return VIR_PY_NONE;
 
     if (c_retval) {
-        if (VIR_ALLOC_N(names, c_retval) < 0)
+        if (VIR_ALLOC_N_QUIET(names, c_retval) < 0)
             return PyErr_NoMemory();
         LIBVIRT_BEGIN_ALLOW_THREADS;
         c_retval = virDomainSnapshotListNames(dom, names, c_retval, flags);
@@ -2554,7 +2554,7 @@ libvirt_virDomainSnapshotListChildrenNames(PyObject *self ATTRIBUTE_UNUSED,
         return VIR_PY_NONE;
 
     if (c_retval) {
-        if (VIR_ALLOC_N(names, c_retval) < 0)
+        if (VIR_ALLOC_N_QUIET(names, c_retval) < 0)
             return PyErr_NoMemory();
         LIBVIRT_BEGIN_ALLOW_THREADS;
         c_retval = virDomainSnapshotListChildrenNames(snap, names, c_retval,
@@ -2886,7 +2886,7 @@ libvirt_virConnectListNetworks(PyObject *self ATTRIBUTE_UNUSED,
         return VIR_PY_NONE;
 
     if (c_retval) {
-        if (VIR_ALLOC_N(names, c_retval) < 0)
+        if (VIR_ALLOC_N_QUIET(names, c_retval) < 0)
             return VIR_PY_NONE;
         LIBVIRT_BEGIN_ALLOW_THREADS;
         c_retval = virConnectListNetworks(conn, names, c_retval);
@@ -2931,7 +2931,7 @@ libvirt_virConnectListDefinedNetworks(PyObject *self ATTRIBUTE_UNUSED,
         return VIR_PY_NONE;
 
     if (c_retval) {
-        if (VIR_ALLOC_N(names, c_retval) < 0)
+        if (VIR_ALLOC_N_QUIET(names, c_retval) < 0)
             return VIR_PY_NONE;
         LIBVIRT_BEGIN_ALLOW_THREADS;
         c_retval = virConnectListDefinedNetworks(conn, names, c_retval);
@@ -3139,7 +3139,7 @@ libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *arg
         return VIR_PY_NONE;
 
     conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn);
-    if (VIR_ALLOC_N(freeMems, maxCells) < 0)
+    if (VIR_ALLOC_N_QUIET(freeMems, maxCells) < 0)
         return VIR_PY_NONE;
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -3183,7 +3183,7 @@ libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
         return VIR_PY_NONE;
 
     if (nparams) {
-        if (VIR_ALLOC_N(stats, nparams) < 0)
+        if (VIR_ALLOC_N_QUIET(stats, nparams) < 0)
             return PyErr_NoMemory();
 
         LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -3246,7 +3246,7 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
         return VIR_PY_NONE;
 
     if (nparams) {
-        if (VIR_ALLOC_N(stats, nparams) < 0)
+        if (VIR_ALLOC_N_QUIET(stats, nparams) < 0)
             return PyErr_NoMemory();
 
         LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -3306,7 +3306,7 @@ libvirt_virConnectListStoragePools(PyObject *self ATTRIBUTE_UNUSED,
         return VIR_PY_NONE;
 
     if (c_retval) {
-        if (VIR_ALLOC_N(names, c_retval) < 0)
+        if (VIR_ALLOC_N_QUIET(names, c_retval) < 0)
             return VIR_PY_NONE;
         LIBVIRT_BEGIN_ALLOW_THREADS;
         c_retval = virConnectListStoragePools(conn, names, c_retval);
@@ -3359,7 +3359,7 @@ libvirt_virConnectListDefinedStoragePools(PyObject *self ATTRIBUTE_UNUSED,
         return VIR_PY_NONE;
 
     if (c_retval) {
-        if (VIR_ALLOC_N(names, c_retval) < 0)
+        if (VIR_ALLOC_N_QUIET(names, c_retval) < 0)
             return VIR_PY_NONE;
         LIBVIRT_BEGIN_ALLOW_THREADS;
         c_retval = virConnectListDefinedStoragePools(conn, names, c_retval);
@@ -3458,7 +3458,7 @@ libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED,
         return VIR_PY_NONE;
 
     if (c_retval) {
-        if (VIR_ALLOC_N(names, c_retval) < 0)
+        if (VIR_ALLOC_N_QUIET(names, c_retval) < 0)
             return VIR_PY_NONE;
         LIBVIRT_BEGIN_ALLOW_THREADS;
         c_retval = virStoragePoolListVolumes(pool, names, c_retval);
@@ -3719,7 +3719,7 @@ libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_UNUSED,
         return VIR_PY_NONE;
 
     if (c_retval) {
-        if (VIR_ALLOC_N(names, c_retval) < 0)
+        if (VIR_ALLOC_N_QUIET(names, c_retval) < 0)
             return VIR_PY_NONE;
         LIBVIRT_BEGIN_ALLOW_THREADS;
         c_retval = virNodeListDevices(conn, cap, names, c_retval, flags);
@@ -3809,7 +3809,7 @@ libvirt_virNodeDeviceListCaps(PyObject *self ATTRIBUTE_UNUSED,
         return VIR_PY_NONE;
 
     if (c_retval) {
-        if (VIR_ALLOC_N(names, c_retval) < 0)
+        if (VIR_ALLOC_N_QUIET(names, c_retval) < 0)
             return VIR_PY_NONE;
         LIBVIRT_BEGIN_ALLOW_THREADS;
         c_retval = virNodeDeviceListCaps(dev, names, c_retval);
@@ -3928,7 +3928,7 @@ libvirt_virConnectListSecrets(PyObject *self ATTRIBUTE_UNUSED,
         return VIR_PY_NONE;
 
     if (c_retval) {
-        if (VIR_ALLOC_N(uuids, c_retval) < 0)
+        if (VIR_ALLOC_N_QUIET(uuids, c_retval) < 0)
             return VIR_PY_NONE;
         LIBVIRT_BEGIN_ALLOW_THREADS;
         c_retval = virConnectListSecrets(conn, uuids, c_retval);
@@ -4147,7 +4147,7 @@ libvirt_virConnectListNWFilters(PyObject *self ATTRIBUTE_UNUSED,
         return VIR_PY_NONE;
 
     if (c_retval) {
-        if (VIR_ALLOC_N(uuids, c_retval) < 0)
+        if (VIR_ALLOC_N_QUIET(uuids, c_retval) < 0)
             return VIR_PY_NONE;
         LIBVIRT_BEGIN_ALLOW_THREADS;
         c_retval = virConnectListNWFilters(conn, uuids, c_retval);
@@ -4238,7 +4238,7 @@ libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED,
         return VIR_PY_NONE;
 
     if (c_retval) {
-        if (VIR_ALLOC_N(names, c_retval) < 0)
+        if (VIR_ALLOC_N_QUIET(names, c_retval) < 0)
             return VIR_PY_NONE;
         LIBVIRT_BEGIN_ALLOW_THREADS;
         c_retval = virConnectListInterfaces(conn, names, c_retval);
@@ -4292,7 +4292,7 @@ libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED,
         return VIR_PY_NONE;
 
     if (c_retval) {
-        if (VIR_ALLOC_N(names, c_retval) < 0)
+        if (VIR_ALLOC_N_QUIET(names, c_retval) < 0)
             return VIR_PY_NONE;
         LIBVIRT_BEGIN_ALLOW_THREADS;
         c_retval = virConnectListDefinedInterfaces(conn, names, c_retval);
@@ -4392,7 +4392,7 @@ libvirt_virConnectBaselineCPU(PyObject *self ATTRIBUTE_UNUSED,
         int i;
 
         ncpus = PyList_Size(list);
-        if (VIR_ALLOC_N(xmlcpus, ncpus) < 0)
+        if (VIR_ALLOC_N_QUIET(xmlcpus, ncpus) < 0)
             return VIR_PY_INT_FAIL;
 
         for (i = 0; i < ncpus; i++) {
@@ -4578,7 +4578,7 @@ libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED,
         return NULL;
     }
 
-    if (VIR_ALLOC_N(params, nparams) < 0)
+    if (VIR_ALLOC_N_QUIET(params, nparams) < 0)
         return PyErr_NoMemory();
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -4639,7 +4639,7 @@ libvirt_virDomainGetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED,
     if (!nparams)
         return PyDict_New();
 
-    if (VIR_ALLOC_N(params, nparams) < 0)
+    if (VIR_ALLOC_N_QUIET(params, nparams) < 0)
         return PyErr_NoMemory();
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -4682,7 +4682,7 @@ libvirt_virDomainGetDiskErrors(PyObject *self ATTRIBUTE_UNUSED,
     ndisks = count;
 
     if (ndisks) {
-        if (VIR_ALLOC_N(disks, ndisks) < 0)
+        if (VIR_ALLOC_N_QUIET(disks, ndisks) < 0)
             return VIR_PY_NONE;
 
         LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -6503,7 +6503,7 @@ libvirt_virStreamRecv(PyObject *self ATTRIBUTE_UNUSED,
     }
     stream = PyvirStream_Get(pyobj_stream);
 
-    if (VIR_ALLOC_N(buf, nbytes+1 > 0 ? nbytes+1 : 1) < 0)
+    if (VIR_ALLOC_N_QUIET(buf, nbytes+1 > 0 ? nbytes+1 : 1) < 0)
         return VIR_PY_NONE;
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -6729,7 +6729,7 @@ libvirt_virDomainBlockPeek(PyObject *self ATTRIBUTE_UNUSED,
 
     domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
 
-    if (VIR_ALLOC_N(buf, size) < 0)
+    if (VIR_ALLOC_N_QUIET(buf, size) < 0)
         return VIR_PY_NONE;
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -6766,7 +6766,7 @@ libvirt_virDomainMemoryPeek(PyObject *self ATTRIBUTE_UNUSED,
 
     domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
 
-    if (VIR_ALLOC_N(buf, size) < 0)
+    if (VIR_ALLOC_N_QUIET(buf, size) < 0)
         return VIR_PY_NONE;
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -6826,7 +6826,7 @@ libvirt_virNodeSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED,
         return NULL;
     }
 
-    if (VIR_ALLOC_N(params, nparams) < 0)
+    if (VIR_ALLOC_N_QUIET(params, nparams) < 0)
         return PyErr_NoMemory();
 
     LIBVIRT_BEGIN_ALLOW_THREADS;
@@ -6886,7 +6886,7 @@ libvirt_virNodeGetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED,
     if (!nparams)
         return PyDict_New();
 
-    if (VIR_ALLOC_N(params, nparams) < 0)
+    if (VIR_ALLOC_N_QUIET(params, nparams) < 0)
         return PyErr_NoMemory();
 
     LIBVIRT_BEGIN_ALLOW_THREADS;

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 402e6e97fa04efa3587cd46ca3919ab24966ce5f..453d59688dd55b405f64bbb7263da51111b0f2e9 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2749,8 +2749,9 @@ virDomainDefPostParseInternal(virDomainDefPtr def,
 
         /* create the serial port definition from the console definition */
         if (def->nserials == 0) {
-            if (VIR_APPEND_ELEMENT(def->serials, def->nserials,
-                                   def->consoles[0]) < 0)
+            if (VIR_APPEND_ELEMENT_QUIET(def->serials,
+                                         def->nserials,
+                                         def->consoles[0]) < 0)
                 goto no_memory;
 
             /* modify it to be a serial port */
@@ -10435,7 +10436,7 @@ virDomainDefMaybeAddController(virDomainDefPtr def,
         cont->opts.vioserial.vectors = -1;
     }
 
-    if (VIR_APPEND_ELEMENT(def->controllers, def->ncontrollers, cont) < 0) {
+    if (VIR_APPEND_ELEMENT_QUIET(def->controllers, def->ncontrollers, cont) < 0) {
         VIR_FREE(cont);
         virReportOOMError();
         return -1;
@@ -11898,10 +11899,10 @@ virDomainDefParseXML(xmlDocPtr xml,
             ii = 0;
             primaryVideo = true;
         }
-        if (VIR_INSERT_ELEMENT_INPLACE(def->videos,
-                                       ii,
-                                       def->nvideos,
-                                       video) < 0) {
+        if (VIR_INSERT_ELEMENT_INPLACE_QUIET(def->videos,
+                                             ii,
+                                             def->nvideos,
+                                             video) < 0) {
             virDomainVideoDefFree(video);
             goto error;
         }

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 64fd581f03bc06134f75819cf699c2d9e3f6f611..e1204b05db4b9a24b616da1dbbfea3617f199ca9 100644 (file)
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -3411,10 +3411,10 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def,
         }
 
         /* add to beginning/end of list */
-        if (VIR_INSERT_ELEMENT(ipdef->hosts,
-                               command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST
-                               ? 0 : ipdef->nhosts,
-                               ipdef->nhosts, host) < 0) {
+        if (VIR_INSERT_ELEMENT_QUIET(ipdef->hosts,
+                                     command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST
+                                     ? 0 : ipdef->nhosts,
+                                     ipdef->nhosts, host) < 0) {
             virReportOOMError();
             goto cleanup;
         }
@@ -3517,10 +3517,10 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def,
         }
 
         /* add to beginning/end of list */
-        if (VIR_INSERT_ELEMENT(ipdef->ranges,
-                               command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST
-                               ? 0 : ipdef->nranges,
-                               ipdef->nranges, range) < 0) {
+        if (VIR_INSERT_ELEMENT_QUIET(ipdef->ranges,
+                                     command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST
+                                     ? 0 : ipdef->nranges,
+                                     ipdef->nranges, range) < 0) {
             virReportOOMError();
             goto cleanup;
         }
@@ -3612,10 +3612,10 @@ virNetworkDefUpdateForwardInterface(virNetworkDefPtr def,
         }
 
         /* add to beginning/end of list */
-        if (VIR_INSERT_ELEMENT(def->forward.ifs,
-                               command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST
-                               ? 0 : def->forward.nifs,
-                               def->forward.nifs, iface) < 0) {
+        if (VIR_INSERT_ELEMENT_QUIET(def->forward.ifs,
+                                     command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST
+                                     ? 0 : def->forward.nifs,
+                                     def->forward.nifs, iface) < 0) {
             virReportOOMError();
             goto cleanup;
         }
@@ -3739,10 +3739,10 @@ virNetworkDefUpdatePortGroup(virNetworkDefPtr def,
         (command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST)) {
 
         /* add to beginning/end of list */
-        if (VIR_INSERT_ELEMENT(def->portGroups,
-                               command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST
-                               ? 0 : def->nPortGroups,
-                               def->nPortGroups, portgroup) < 0) {
+        if (VIR_INSERT_ELEMENT_QUIET(def->portGroups,
+                                     command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST
+                                     ? 0 : def->nPortGroups,
+                                     def->nPortGroups, portgroup) < 0) {
             virReportOOMError();
             goto cleanup;
         }
@@ -3823,9 +3823,9 @@ virNetworkDefUpdateDNSHost(virNetworkDefPtr def,
         }
 
         /* add to beginning/end of list */
-        if (VIR_INSERT_ELEMENT(dns->hosts,
-                               command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST
-                               ? 0 : dns->nhosts, dns->nhosts, host) < 0) {
+        if (VIR_INSERT_ELEMENT_QUIET(dns->hosts,
+                                     command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST
+                                     ? 0 : dns->nhosts, dns->nhosts, host) < 0) {
             virReportOOMError();
             goto cleanup;
         }
@@ -3911,9 +3911,9 @@ virNetworkDefUpdateDNSSrv(virNetworkDefPtr def,
         }
 
         /* add to beginning/end of list */
-        if (VIR_INSERT_ELEMENT(dns->srvs,
-                               command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST
-                               ? 0 : dns->nsrvs, dns->nsrvs, srv) < 0) {
+        if (VIR_INSERT_ELEMENT_QUIET(dns->srvs,
+                                     command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST
+                                     ? 0 : dns->nsrvs, dns->nsrvs, srv) < 0) {
             virReportOOMError();
             goto cleanup;
         }
@@ -3993,9 +3993,9 @@ virNetworkDefUpdateDNSTxt(virNetworkDefPtr def,
         }
 
         /* add to beginning/end of list */
-        if (VIR_INSERT_ELEMENT(dns->txts,
-                               command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST
-                               ? 0 : dns->ntxts, dns->ntxts, txt) < 0) {
+        if (VIR_INSERT_ELEMENT_QUIET(dns->txts,
+                                     command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST
+                                     ? 0 : dns->ntxts, dns->ntxts, txt) < 0) {
             virReportOOMError();
             goto cleanup;
         }

diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index 8dc2592ec02bd585e1cd876fb828d52ad80bddb2..39420b6e722a3bc36993e4139a37c4b35e507c2a 100644 (file)
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -1750,7 +1750,7 @@ esxVI_Alloc(void **ptrptr, size_t size)
         return -1;
     }
 
-    if (virAllocN(ptrptr, size, 1) < 0) {
+    if (virAllocN(ptrptr, size, 1, false, 0, NULL, NULL, 0) < 0) {
         virReportOOMError();
         return -1;
     }

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 990decb734596e232b59b3fb0225ebb3cd73d970..861ab65aa58ac1b9147be202dabf45b936bd9e76 100644 (file)
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -1000,10 +1000,10 @@ virLXCProcessEnsureRootFS(virDomainObjPtr vm)
         VIR_STRDUP(root->dst, "/") < 0)
         goto error;
 
-    if (VIR_INSERT_ELEMENT(vm->def->fss,
-                           0,
-                           vm->def->nfss,
-                           root) < 0)
+    if (VIR_INSERT_ELEMENT_QUIET(vm->def->fss,
+                                 0,
+                                 vm->def->nfss,
+                                 root) < 0)
         goto no_memory;
 
     return 0;

diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index f7c5c2ef5ee5c1d4bf9ae6fa49b33fd7209334e5..1469052ce717d58d1365fe9bc3adbda706948983 100644 (file)
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -487,7 +487,7 @@ int virSecurityManagerGenLabel(virSecurityManagerPtr mgr,
             /* The seclabel must be added to @vm prior calling domainGenSecurityLabel
              * which may require seclabel to be presented already */
             if (generated &&
-                VIR_APPEND_ELEMENT(vm->seclabels, vm->nseclabels, seclabel) < 0) {
+                VIR_APPEND_ELEMENT_QUIET(vm->seclabels, vm->nseclabels, seclabel) < 0) {
                 virReportOOMError();
                 goto cleanup;
             }

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index d7c978dbeae6c0a0d9a81b41f536d2fbb98219ed..380aaf512574c4c416271a0716ae1b1db8fb4507 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -1224,7 +1224,8 @@ virSecuritySELinuxSetSecurityFileLabel(virDomainDiskDefPtr disk,
         if (!disk_seclabel)
             return -1;
         disk_seclabel->norelabel = true;
-        if (VIR_APPEND_ELEMENT(disk->seclabels, disk->nseclabels, disk_seclabel) < 0) {
+        if (VIR_APPEND_ELEMENT_QUIET(disk->seclabels, disk->nseclabels,
+                                     disk_seclabel) < 0) {
             virReportOOMError();
             virSecurityDeviceLabelDefFree(disk_seclabel);
             return -1;

diff --git a/src/util/viralloc.c b/src/util/viralloc.c
index 8d6a7e6d32c21f9ace1e9a5cba78c3893fbe7b21..8008f33db3182c8bdc3402e45ee29e6b195cf9ff 100644 (file)
--- a/src/util/viralloc.c
+++ b/src/util/viralloc.c
@@ -25,6 +25,9 @@
 
 #include "viralloc.h"
 #include "virlog.h"
+#include "virerror.h"
+
+#define VIR_FROM_THIS VIR_FROM_NONE
 
 #if TEST_OOM
 static int testMallocNext = 0;
@@ -105,14 +108,26 @@ void virAllocTestHook(void (*func)(int, void*) ATTRIBUTE_UNUSED,
  * virAlloc:
  * @ptrptr: pointer to pointer for address of allocated memory
  * @size: number of bytes to allocate
+ * @report: whether to report OOM error, if there is one
+ * @domcode: error domain code
+ * @filename: caller's filename
+ * @funcname: caller's funcname
+ * @linenr: caller's line number
  *
  * Allocate  'size' bytes of memory. Return the address of the
  * allocated memory in 'ptrptr'. The newly allocated memory is
- * filled with zeros.
+ * filled with zeros. If @report is true, OOM errors are
+ * reported automatically.
  *
  * Returns -1 on failure to allocate, zero on success
  */
-int virAlloc(void *ptrptr, size_t size)
+int virAlloc(void *ptrptr,
+             size_t size,
+             bool report,
+             int domcode,
+             const char *filename,
+             const char *funcname,
+             size_t linenr)
 {
 #if TEST_OOM
     if (virAllocTestFail()) {
@@ -122,8 +137,11 @@ int virAlloc(void *ptrptr, size_t size)
 #endif
 
     *(void **)ptrptr = calloc(1, size);
-    if (*(void **)ptrptr == NULL)
+    if (*(void **)ptrptr == NULL) {
+        if (report)
+            virReportOOMErrorFull(domcode, filename, funcname, linenr);
         return -1;
+    }
     return 0;
 }
 
@@ -132,15 +150,28 @@ int virAlloc(void *ptrptr, size_t size)
  * @ptrptr: pointer to pointer for address of allocated memory
  * @size: number of bytes to allocate
  * @count: number of elements to allocate
+ * @report: whether to report OOM error, if there is one
+ * @domcode: error domain code
+ * @filename: caller's filename
+ * @funcname: caller's funcname
+ * @linenr: caller's line number
  *
  * Allocate an array of memory 'count' elements long,
  * each with 'size' bytes. Return the address of the
  * allocated memory in 'ptrptr'.  The newly allocated
- * memory is filled with zeros.
+ * memory is filled with zeros. If @report is true,
+ * OOM errors are reported automatically.
  *
  * Returns -1 on failure to allocate, zero on success
  */
-int virAllocN(void *ptrptr, size_t size, size_t count)
+int virAllocN(void *ptrptr,
+              size_t size,
+              size_t count,
+              bool report,
+              int domcode,
+              const char *filename,
+              const char *funcname,
+              size_t linenr)
 {
 #if TEST_OOM
     if (virAllocTestFail()) {
@@ -150,8 +181,11 @@ int virAllocN(void *ptrptr, size_t size, size_t count)
 #endif
 
     *(void**)ptrptr = calloc(count, size);
-    if (*(void**)ptrptr == NULL)
+    if (*(void**)ptrptr == NULL) {
+        if (report)
+            virReportOOMErrorFull(domcode, filename, funcname, linenr);
         return -1;
+    }
     return 0;
 }
 
@@ -160,16 +194,29 @@ int virAllocN(void *ptrptr, size_t size, size_t count)
  * @ptrptr: pointer to pointer for address of allocated memory
  * @size: number of bytes to allocate
  * @count: number of elements in array
+ * @report: whether to report OOM error, if there is one
+ * @domcode: error domain code
+ * @filename: caller's filename
+ * @funcname: caller's funcname
+ * @linenr: caller's line number
  *
  * Resize the block of memory in 'ptrptr' to be an array of
  * 'count' elements, each 'size' bytes in length. Update 'ptrptr'
  * with the address of the newly allocated memory. On failure,
  * 'ptrptr' is not changed and still points to the original memory
  * block. Any newly allocated memory in 'ptrptr' is uninitialized.
+ * If @report is true, OOM errors are reported automatically.
  *
  * Returns -1 on failure to allocate, zero on success
  */
-int virReallocN(void *ptrptr, size_t size, size_t count)
+int virReallocN(void *ptrptr,
+                size_t size,
+                size_t count,
+                bool report,
+                int domcode,
+                const char *filename,
+                const char *funcname,
+                size_t linenr)
 {
     void *tmp;
 #if TEST_OOM
@@ -178,12 +225,17 @@ int virReallocN(void *ptrptr, size_t size, size_t count)
 #endif
 
     if (xalloc_oversized(count, size)) {
+        if (report)
+            virReportOOMErrorFull(domcode, filename, funcname, linenr);
         errno = ENOMEM;
         return -1;
     }
     tmp = realloc(*(void**)ptrptr, size * count);
-    if (!tmp && (size * count))
+    if (!tmp && (size * count)) {
+        if (report)
+            virReportOOMErrorFull(domcode, filename, funcname, linenr);
         return -1;
+    }
     *(void**)ptrptr = tmp;
     return 0;
 }
@@ -194,24 +246,41 @@ int virReallocN(void *ptrptr, size_t size, size_t count)
  * @size: number of bytes per element
  * @countptr: pointer to number of elements in array
  * @add: number of elements to add
+ * @report: whether to report OOM error, if there is one
+ * @domcode: error domain code
+ * @filename: caller's filename
+ * @funcname: caller's funcname
+ * @linenr: caller's line number
  *
  * Resize the block of memory in 'ptrptr' to be an array of
  * '*countptr' + 'add' elements, each 'size' bytes in length.
  * Update 'ptrptr' and 'countptr'  with the details of the newly
  * allocated memory. On failure, 'ptrptr' and 'countptr' are not
  * changed. Any newly allocated memory in 'ptrptr' is zero-filled.
+ * If @report is true, OOM errors are reported automatically.
  *
  * Returns -1 on failure to allocate, zero on success
  */
-int virExpandN(void *ptrptr, size_t size, size_t *countptr, size_t add)
+int virExpandN(void *ptrptr,
+               size_t size,
+               size_t *countptr,
+               size_t add,
+               bool report,
+               int domcode,
+               const char *filename,
+               const char *funcname,
+               size_t linenr)
 {
     int ret;
 
     if (*countptr + add < *countptr) {
+        if (report)
+            virReportOOMErrorFull(domcode, filename, funcname, linenr);
         errno = ENOMEM;
         return -1;
     }
-    ret = virReallocN(ptrptr, size, *countptr + add);
+    ret = virReallocN(ptrptr, size, *countptr + add, report,
+                      domcode, filename, funcname, linenr);
     if (ret == 0) {
         memset(*(char **)ptrptr + (size * *countptr), 0, size * add);
         *countptr += add;
@@ -226,22 +295,39 @@ int virExpandN(void *ptrptr, size_t size, size_t *countptr, size_t add)
  * @allocptr: pointer to number of elements allocated in array
  * @count: number of elements currently used in array
  * @add: minimum number of additional elements to support in array
+ * @report: whether to report OOM error, if there is one
+ * @domcode: error domain code
+ * @filename: caller's filename
+ * @funcname: caller's funcname
+ * @linenr: caller's line number
  *
  * If 'count' + 'add' is larger than '*allocptr', then resize the
  * block of memory in 'ptrptr' to be an array of at least 'count' +
  * 'add' elements, each 'size' bytes in length. Update 'ptrptr' and
  * 'allocptr' with the details of the newly allocated memory. On
  * failure, 'ptrptr' and 'allocptr' are not changed. Any newly
- * allocated memory in 'ptrptr' is zero-filled.
+ * allocated memory in 'ptrptr' is zero-filled. If @report is true,
+ * OOM errors are reported automatically.
+ *
  *
  * Returns -1 on failure to allocate, zero on success
  */
-int virResizeN(void *ptrptr, size_t size, size_t *allocptr, size_t count,
-               size_t add)
+int virResizeN(void *ptrptr,
+               size_t size,
+               size_t *allocptr,
+               size_t count,
+               size_t add,
+               bool report,
+               int domcode,
+               const char *filename,
+               const char *funcname,
+               size_t linenr)
 {
     size_t delta;
 
     if (count + add < count) {
+        if (report)
+            virReportOOMErrorFull(domcode, filename, funcname, linenr);
         errno = ENOMEM;
         return -1;
     }
@@ -251,7 +337,8 @@ int virResizeN(void *ptrptr, size_t size, size_t *allocptr, size_t count,
     delta = count + add - *allocptr;
     if (delta < *allocptr / 2)
         delta = *allocptr / 2;
-    return virExpandN(ptrptr, size, allocptr, delta);
+    return virExpandN(ptrptr, size, allocptr, delta, report,
+                      domcode, filename, funcname, linenr);
 }
 
 /**
@@ -270,7 +357,8 @@ int virResizeN(void *ptrptr, size_t size, size_t *allocptr, size_t count,
 void virShrinkN(void *ptrptr, size_t size, size_t *countptr, size_t toremove)
 {
     if (toremove < *countptr)
-        ignore_value(virReallocN(ptrptr, size, *countptr -= toremove));
+        ignore_value(virReallocN(ptrptr, size, *countptr -= toremove,
+                                 false, 0, NULL, NULL, 0));
     else {
         virFree(ptrptr);
         *countptr = 0;
@@ -293,6 +381,11 @@ void virShrinkN(void *ptrptr, size_t size, size_t *countptr, size_t toremove)
  * @inPlace:  false if we should expand the allocated memory before
  *            moving, true if we should assume someone else *has
  *            already* done that.
+ * @report:   whether to report OOM error, if there is one
+ * @domcode:  error domain code
+ * @filename: caller's filename
+ * @funcname: caller's funcname
+ * @linenr:   caller's line number
  *
  * Re-allocate an array of *countptr elements, each sizeof(*ptrptr) bytes
  * long, to be *countptr+add elements long, then appropriately move
@@ -301,7 +394,8 @@ void virShrinkN(void *ptrptr, size_t size, size_t *countptr, size_t toremove)
  * allocated memory in *ptrptr and the new size in *countptr.  If
  * newelems is NULL, the new elements at ptrptr[at] are instead filled
  * with zero.  at must be between [0,*countptr], except that -1 is
- * treated the same as *countptr for convenience.
+ * treated the same as *countptr for convenience. If @report is true,
+ * OOM errors are reported automatically.
  *
  * Returns -1 on failure, 0 on success
  */
@@ -309,19 +403,26 @@ int
 virInsertElementsN(void *ptrptr, size_t size, size_t at,
                    size_t *countptr,
                    size_t add, void *newelems,
-                   bool clearOriginal, bool inPlace)
+                   bool clearOriginal, bool inPlace,
+                   bool report,
+                   int domcode,
+                   const char *filename,
+                   const char *funcname,
+                   size_t linenr)
 {
     if (at == -1) {
         at = *countptr;
     } else if (at > *countptr) {
-        VIR_WARN("out of bounds index - count %zu at %zu add %zu",
-                 *countptr, at, add);
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("out of bounds index - count %zu at %zu add %zu"),
+                       *countptr, at, add);
         return -1;
     }
 
     if (inPlace) {
         *countptr += add;
-    } else if (virExpandN(ptrptr, size, countptr, add) < 0) {
+    } else if (virExpandN(ptrptr, size, countptr, add, report,
+                          domcode, filename, funcname, linenr) < 0) {
         return -1;
     }
 
@@ -397,6 +498,11 @@ virDeleteElementsN(void *ptrptr, size_t size, size_t at,
  * @struct_size: size of initial struct
  * @element_size: size of array elements
  * @count: number of array elements to allocate
+ * @report: whether to report OOM error, if there is one
+ * @domcode: error domain code
+ * @filename: caller's filename
+ * @funcname: caller's funcname
+ * @linenr: caller's line number
  *
  * Allocate struct_size bytes plus an array of 'count' elements, each
  * of size element_size.  This sort of allocation is useful for
@@ -405,11 +511,20 @@ virDeleteElementsN(void *ptrptr, size_t size, size_t at,
  * The caller of this type of API is expected to know the length of
  * the array that will be returned and allocate a suitable buffer to
  * contain the returned data.  C99 refers to these variable length
- * objects as structs containing flexible array members.
+ * objects as structs containing flexible array members. If @report
+ * is true, OOM errors are reported automatically.
  *
  * Returns -1 on failure, 0 on success
  */
-int virAllocVar(void *ptrptr, size_t struct_size, size_t element_size, size_t count)
+int virAllocVar(void *ptrptr,
+                size_t struct_size,
+                size_t element_size,
+                size_t count,
+                bool report,
+                int domcode,
+                const char *filename,
+                const char *funcname,
+                size_t linenr)
 {
     size_t alloc_size = 0;
 
@@ -419,14 +534,19 @@ int virAllocVar(void *ptrptr, size_t struct_size, size_t element_size, size_t co
 #endif
 
     if (VIR_ALLOC_VAR_OVERSIZED(struct_size, count, element_size)) {
+        if (report)
+            virReportOOMErrorFull(domcode, filename, funcname, linenr);
         errno = ENOMEM;
         return -1;
     }
 
     alloc_size = struct_size + (element_size * count);
     *(void **)ptrptr = calloc(1, alloc_size);
-    if (*(void **)ptrptr == NULL)
+    if (*(void **)ptrptr == NULL) {
+        if (report)
+            virReportOOMErrorFull(domcode, filename, funcname, linenr);
         return -1;
+    }
     return 0;
 }
 

diff --git a/src/util/viralloc.h b/src/util/viralloc.h
index 35d3a37f742519b4a8e2a7e214c6dfb1e1e2700f..2ed654d70be240b532635dbe582aefeac436f5ad 100644 (file)
--- a/src/util/viralloc.h
+++ b/src/util/viralloc.h
@@ -46,30 +46,36 @@
 
 
 /* Don't call these directly - use the macros below */
-int virAlloc(void *ptrptr, size_t size) ATTRIBUTE_RETURN_CHECK
-    ATTRIBUTE_NONNULL(1);
-int virAllocN(void *ptrptr, size_t size, size_t count) ATTRIBUTE_RETURN_CHECK
-    ATTRIBUTE_NONNULL(1);
-int virReallocN(void *ptrptr, size_t size, size_t count) ATTRIBUTE_RETURN_CHECK
-    ATTRIBUTE_NONNULL(1);
-int virExpandN(void *ptrptr, size_t size, size_t *count, size_t add)
+int virAlloc(void *ptrptr, size_t size, bool report, int domcode,
+             const char *filename, const char *funcname, size_t linenr)
+    ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1);
+int virAllocN(void *ptrptr, size_t size, size_t count, bool report, int domcode,
+              const char *filename, const char *funcname, size_t linenr)
+    ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1);
+int virReallocN(void *ptrptr, size_t size, size_t count, bool report, int domcode,
+                const char *filename, const char *funcname, size_t linenr)
+    ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1);
+int virExpandN(void *ptrptr, size_t size, size_t *count, size_t add, bool report,
+               int domcode, const char *filename, const char *funcname, size_t linenr)
     ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
-int virResizeN(void *ptrptr, size_t size, size_t *alloc, size_t count,
-               size_t desired)
+int virResizeN(void *ptrptr, size_t size, size_t *alloc, size_t count, size_t desired,
+               bool report, int domcode, const char *filename,
+               const char *funcname, size_t linenr)
     ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
 void virShrinkN(void *ptrptr, size_t size, size_t *count, size_t toremove)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
 int virInsertElementsN(void *ptrptr, size_t size, size_t at, size_t *countptr,
                        size_t add, void *newelem,
-                       bool clearOriginal, bool inPlace)
+                       bool clearOriginal, bool inPlace, bool report, int domcode,
+                       const char *filename, const char *funcname, size_t linenr)
     ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4);
 int virDeleteElementsN(void *ptrptr, size_t size, size_t at, size_t *countptr,
                        size_t toremove, bool inPlace)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4);
-int virAllocVar(void *ptrptr,
-                size_t struct_size,
-                size_t element_size,
-                size_t count) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1);
+int virAllocVar(void *ptrptr, size_t struct_size, size_t element_size, size_t count,
+                bool report, int domcode, const char *filename,
+                const char *funcname, size_t linenr)
+    ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1);
 void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1);
 
 /**
@@ -82,9 +88,24 @@ void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1);
  *
  * This macro is safe to use on arguments with side effects.
  *
+ * Returns -1 on failure (with OOM error reported), 0 on success
+ */
+# define VIR_ALLOC(ptr) virAlloc(&(ptr), sizeof(*(ptr)), true, VIR_FROM_THIS, \
+                                 __FILE__, __FUNCTION__, __LINE__)
+
+/**
+ * VIR_ALLOC_QUIET:
+ * @ptr: pointer to hold address of allocated memory
+ *
+ * Allocate sizeof(*ptr) bytes of memory and store
+ * the address of allocated memory in 'ptr'. Fill the
+ * newly allocated memory with zeros.
+ *
+ * This macro is safe to use on arguments with side effects.
+ *
  * Returns -1 on failure, 0 on success
  */
-# define VIR_ALLOC(ptr) virAlloc(&(ptr), sizeof(*(ptr)))
+# define VIR_ALLOC_QUIET(ptr) virAlloc(&(ptr), sizeof(*(ptr)), false, 0, NULL, NULL, 0)
 
 /**
  * VIR_ALLOC_N:
@@ -97,9 +118,26 @@ void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1);
  *
  * This macro is safe to use on arguments with side effects.
  *
+ * Returns -1 on failure (with OOM error reported), 0 on success
+ */
+# define VIR_ALLOC_N(ptr, count) virAllocN(&(ptr), sizeof(*(ptr)), (count), true, \
+                                           VIR_FROM_THIS, __FILE__, __FUNCTION__, __LINE__)
+
+/**
+ * VIR_ALLOC_N_QUIET:
+ * @ptr: pointer to hold address of allocated memory
+ * @count: number of elements to allocate
+ *
+ * Allocate an array of 'count' elements, each sizeof(*ptr)
+ * bytes long and store the address of allocated memory in
+ * 'ptr'. Fill the newly allocated memory with zeros.
+ *
+ * This macro is safe to use on arguments with side effects.
+ *
  * Returns -1 on failure, 0 on success
  */
-# define VIR_ALLOC_N(ptr, count) virAllocN(&(ptr), sizeof(*(ptr)), (count))
+# define VIR_ALLOC_N_QUIET(ptr, count) virAllocN(&(ptr), sizeof(*(ptr)), (count), \
+                                                 false, 0, NULL, NULL, 0)
 
 /**
  * VIR_REALLOC_N:
@@ -112,9 +150,27 @@ void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1);
  *
  * This macro is safe to use on arguments with side effects.
  *
+ * Returns -1 on failure (with OOM error reported), 0 on success
+ */
+# define VIR_REALLOC_N(ptr, count) virReallocN(&(ptr), sizeof(*(ptr)), (count), \
+                                               true, VIR_FROM_THIS, __FILE__, \
+                                               __FUNCTION__, __LINE__)
+
+/**
+ * VIR_REALLOC_N_QUIET:
+ * @ptr: pointer to hold address of allocated memory
+ * @count: number of elements to allocate
+ *
+ * Re-allocate an array of 'count' elements, each sizeof(*ptr)
+ * bytes long and store the address of allocated memory in
+ * 'ptr'. If 'ptr' grew, the added memory is uninitialized.
+ *
+ * This macro is safe to use on arguments with side effects.
+ *
  * Returns -1 on failure, 0 on success
  */
-# define VIR_REALLOC_N(ptr, count) virReallocN(&(ptr), sizeof(*(ptr)), (count))
+# define VIR_REALLOC_N_QUIET(ptr, count) virReallocN(&(ptr), sizeof(*(ptr)), (count), \
+                                                     false, 0, NULL, NULL, 0)
 
 /**
  * VIR_EXPAND_N:
@@ -129,10 +185,29 @@ void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1);
  *
  * This macro is safe to use on arguments with side effects.
  *
- * Returns -1 on failure, 0 on success
+ * Returns -1 on failure (with OOM error reported), 0 on success
  */
 # define VIR_EXPAND_N(ptr, count, add) \
-    virExpandN(&(ptr), sizeof(*(ptr)), &(count), add)
+    virExpandN(&(ptr), sizeof(*(ptr)), &(count), add, true, VIR_FROM_THIS, \
+               __FILE__, __FUNCTION__, __LINE__)
+
+/**
+ * VIR_EXPAND_N_QUIET:
+ * @ptr: pointer to hold address of allocated memory
+ * @count: variable tracking number of elements currently allocated
+ * @add: number of elements to add
+ *
+ * Re-allocate an array of 'count' elements, each sizeof(*ptr)
+ * bytes long, to be 'count' + 'add' elements long, then store the
+ * address of allocated memory in 'ptr' and the new size in 'count'.
+ * The new elements are filled with zero.
+ *
+ * This macro is safe to use on arguments with side effects.
+ *
+ * Returns -1 on failure, 0 on success
+ */
+# define VIR_EXPAND_N_QUIET(ptr, count, add) \
+    virExpandN(&(ptr), sizeof(*(ptr)), &(count), add, false, 0, NULL, NULL, 0)
 
 /**
  * VIR_RESIZE_N:
@@ -154,10 +229,37 @@ void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1);
  *
  * This macro is safe to use on arguments with side effects.
  *
- * Returns -1 on failure, 0 on success
+ * Returns -1 on failure (with OOM error reported), 0 on success
  */
 # define VIR_RESIZE_N(ptr, alloc, count, add) \
-    virResizeN(&(ptr), sizeof(*(ptr)), &(alloc), count, add)
+    virResizeN(&(ptr), sizeof(*(ptr)), &(alloc), count, add, true, \
+               VIR_FROM_THIS, __FILE__, __FUNCTION__, __LINE__)
+
+/**
+ * VIR_RESIZE_N_QUIET:
+ * @ptr: pointer to hold address of allocated memory
+ * @alloc: variable tracking number of elements currently allocated
+ * @count: number of elements currently in use
+ * @add: minimum number of elements to additionally support
+ *
+ * Blindly using VIR_EXPAND_N(array, alloc, 1) in a loop scales
+ * quadratically, because every iteration must copy contents from
+ * all prior iterations.  But amortized linear scaling can be achieved
+ * by tracking allocation size separately from the number of used
+ * elements, and growing geometrically only as needed.
+ *
+ * If 'count' + 'add' is larger than 'alloc', then geometrically reallocate
+ * the array of 'alloc' elements, each sizeof(*ptr) bytes long, and store
+ * the address of allocated memory in 'ptr' and the new size in 'alloc'.
+ * The new elements are filled with zero.
+ *
+ * This macro is safe to use on arguments with side effects.
+ *
+ * Returns -1 on failure, 0 on success
+ */
+# define VIR_RESIZE_N_QUIET(ptr, alloc, count, add) \
+    virResizeN(&(ptr), sizeof(*(ptr)), &(alloc), count, add, \
+               false, 0, NULL, NULL, 0)
 
 /**
  * VIR_SHRINK_N:
@@ -250,20 +352,42 @@ void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1);
  *
  * These macros are safe to use on arguments with side effects.
  *
- * Returns -1 on failure, 0 on success
+ * Returns -1 on failure (with OOM error reported), 0 on success
  */
 # define VIR_INSERT_ELEMENT(ptr, at, count, newelem) \
     virInsertElementsN(&(ptr), sizeof(*(ptr)), at, &(count),    \
-                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), true, false)
+                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), true, false, \
+                       true, VIR_FROM_THIS, __FILE__, __FUNCTION__, __LINE__)
 # define VIR_INSERT_ELEMENT_COPY(ptr, at, count, newelem) \
     virInsertElementsN(&(ptr), sizeof(*(ptr)), at, &(count), \
-                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), false, false)
+                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), false, false, \
+                       true, VIR_FROM_THIS, __FILE__, __FUNCTION__, __LINE__)
 # define VIR_INSERT_ELEMENT_INPLACE(ptr, at, count, newelem) \
     virInsertElementsN(&(ptr), sizeof(*(ptr)), at, &(count), \
-                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), true, true)
+                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), true, true, \
+                       true, VIR_FROM_THIS, __FILE__, __FUNCTION__, __LINE__)
 # define VIR_INSERT_ELEMENT_COPY_INPLACE(ptr, at, count, newelem) \
     virInsertElementsN(&(ptr), sizeof(*(ptr)), at, &(count), \
-                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), false, true)
+                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), false, true, \
+                       true, VIR_FROM_THIS, __FILE__, __FUNCTION__, __LINE__)
+
+/* Quiet version of macros above */
+# define VIR_INSERT_ELEMENT_QUIET(ptr, at, count, newelem) \
+    virInsertElementsN(&(ptr), sizeof(*(ptr)), at, &(count),    \
+                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), true, false, \
+                       false, 0, NULL, NULL, 0)
+# define VIR_INSERT_ELEMENT_COPY_QUIET(ptr, at, count, newelem) \
+    virInsertElementsN(&(ptr), sizeof(*(ptr)), at, &(count), \
+                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), false, false, \
+                       false, 0, NULL, NULL, 0)
+# define VIR_INSERT_ELEMENT_INPLACE_QUIET(ptr, at, count, newelem) \
+    virInsertElementsN(&(ptr), sizeof(*(ptr)), at, &(count), \
+                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), true, true, \
+                       false, 0, NULL, NULL, 0)
+# define VIR_INSERT_ELEMENT_COPY_INPLACE_QUIET(ptr, at, count, newelem) \
+    virInsertElementsN(&(ptr), sizeof(*(ptr)), at, &(count), \
+                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), false, true, \
+                       false, 0, NULL, NULL, 0)
 
 /**
  * VIR_APPEND_ELEMENT:
@@ -298,21 +422,42 @@ void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1);
  *
  * These macros are safe to use on arguments with side effects.
  *
- * Returns -1 on failure, 0 on success
+ * Returns -1 on failure (with OOM error reported), 0 on success
  */
 # define VIR_APPEND_ELEMENT(ptr, count, newelem) \
     virInsertElementsN(&(ptr), sizeof(*(ptr)), -1, &(count),  \
-                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), true, false)
+                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), true, false, \
+                       true, VIR_FROM_THIS, __FILE__, __FUNCTION__, __LINE__)
 # define VIR_APPEND_ELEMENT_COPY(ptr, count, newelem) \
     virInsertElementsN(&(ptr), sizeof(*(ptr)), -1, &(count),  \
-                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), false, false)
+                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), false, false, \
+                       true, VIR_FROM_THIS, __FILE__, __FUNCTION__, __LINE__)
 # define VIR_APPEND_ELEMENT_INPLACE(ptr, count, newelem) \
     virInsertElementsN(&(ptr), sizeof(*(ptr)), -1, &(count),  \
-                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), true, true)
+                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), true, true, \
+                       true, VIR_FROM_THIS, __FILE__, __FUNCTION__, __LINE__)
 # define VIR_APPEND_ELEMENT_COPY_INPLACE(ptr, count, newelem) \
     virInsertElementsN(&(ptr), sizeof(*(ptr)), -1, &(count),  \
-                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), false, true)
+                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), false, true, \
+                       true, VIR_FROM_THIS, __FILE__, __FUNCTION__, __LINE__)
 
+/* Quiet version of macros above */
+# define VIR_APPEND_ELEMENT_QUIET(ptr, count, newelem) \
+    virInsertElementsN(&(ptr), sizeof(*(ptr)), -1, &(count),  \
+                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), true, false, \
+                       false, 0, NULL, NULL, 0)
+# define VIR_APPEND_ELEMENT_COPY_QUIT(Eptr, count, newelem) \
+    virInsertElementsN(&(ptr), sizeof(*(ptr)), -1, &(count),  \
+                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), false, false, \
+                       false, 0, NULL, NULL, 0)
+# define VIR_APPEND_ELEMENT_INPLACE_QUIET(ptr, count, newelem) \
+    virInsertElementsN(&(ptr), sizeof(*(ptr)), -1, &(count),  \
+                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), true, true, \
+                       false. 0, NULL, NULL, 0)
+# define VIR_APPEND_ELEMENT_COPY_INPLACE_QUIET(ptr, count, newelem) \
+    virInsertElementsN(&(ptr), sizeof(*(ptr)), -1, &(count),  \
+                       VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), false, true, \
+                       false, 0, NULL, NULL, 0)
 /**
  * VIR_DELETE_ELEMENT:
  * @ptr:   pointer to array of objects (*not* ptr to ptr)
@@ -365,10 +510,33 @@ void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1);
  *
  * This macro is safe to use on arguments with side effects.
  *
- * Returns -1 on failure, 0 on success
+ * Returns -1 on failure (with OOM error reported), 0 on success
  */
 # define VIR_ALLOC_VAR(ptr, type, count) \
-    virAllocVar(&(ptr), sizeof(*(ptr)), sizeof(type), (count))
+    virAllocVar(&(ptr), sizeof(*(ptr)), sizeof(type), (count), true, \
+                VIR_FROM_THIS, __FILE__, __FUNCTION__, __LINE__)
+
+/**
+ * VIR_ALLOC_VAR_QUIET:
+ * @ptr: pointer to hold address of allocated memory
+ * @type: element type of trailing array
+ * @count: number of array elements to allocate
+ *
+ * Allocate sizeof(*ptr) bytes plus an array of 'count' elements, each
+ * sizeof('type').  This sort of allocation is useful for receiving
+ * the data of certain ioctls and other APIs which return a struct in
+ * which the last element is an array of undefined length.  The caller
+ * of this type of API is expected to know the length of the array
+ * that will be returned and allocate a suitable buffer to contain the
+ * returned data.  C99 refers to these variable length objects as
+ * structs containing flexible array members.
+ *
+ * This macro is safe to use on arguments with side effects.
+ *
+ * Returns -1 on failure, 0 on success
+ */
+# define VIR_ALLOC_VAR_QUIET(ptr, type, count) \
+    virAllocVar(&(ptr), sizeof(*(ptr)), sizeof(type), (count), false, 0, NULL, NULL, 0)
 
 /**
  * VIR_FREE:

diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
index 4969497c008b83cd4421e6842b0714618d4f8091..ee0be6c8d95bf5eff70116b42a02b25cc8fd5928 100644 (file)
--- a/src/util/virbuffer.c
+++ b/src/util/virbuffer.c
@@ -126,7 +126,7 @@ virBufferGrow(virBufferPtr buf, unsigned int len)
 
     size = buf->use + len + 1000;
 
-    if (VIR_REALLOC_N(buf->content, size) < 0) {
+    if (VIR_REALLOC_N_QUIET(buf->content, size) < 0) {
         virBufferSetError(buf, errno);
         return -1;
     }
@@ -382,7 +382,7 @@ virBufferEscapeString(virBufferPtr buf, const char *format, const char *str)
     }
 
     if (xalloc_oversized(6, len) ||
-        VIR_ALLOC_N(escaped, 6 * len + 1) < 0) {
+        VIR_ALLOC_N_QUIET(escaped, 6 * len + 1) < 0) {
         virBufferSetError(buf, errno);
         return;
     }
@@ -499,7 +499,7 @@ virBufferEscape(virBufferPtr buf, char escape, const char *toescape,
     }
 
     if (xalloc_oversized(2, len) ||
-        VIR_ALLOC_N(escaped, 2 * len + 1) < 0) {
+        VIR_ALLOC_N_QUIET(escaped, 2 * len + 1) < 0) {
         virBufferSetError(buf, errno);
         return;
     }
@@ -597,7 +597,7 @@ virBufferEscapeShell(virBufferPtr buf, const char *str)
     if (*str) {
         len = strlen(str);
         if (xalloc_oversized(4, len) ||
-            VIR_ALLOC_N(escaped, 4 * len + 3) < 0) {
+            VIR_ALLOC_N_QUIET(escaped, 4 * len + 3) < 0) {
             virBufferSetError(buf, errno);
             return;
         }

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index e0b25ede0b66e564e3775367c9decac69801f049..d63732e80c8f90dd087f46277ad605eb870a601b 100644 (file)
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -1171,7 +1171,7 @@ static int virCgroupPartitionEscape(char **path)
     if ((rc = virCgroupPartitionNeedsEscaping(*path)) <= 0)
         return rc;
 
-    if (VIR_INSERT_ELEMENT(*path, 0, len, escape) < 0)
+    if (VIR_INSERT_ELEMENT_QUIET(*path, 0, len, escape) < 0)
         return -ENOMEM;
 
     return 0;

diff --git a/src/util/virerror.c b/src/util/virerror.c
index 4789baeb48375b75340df3f04354921e64325cb0..e238dceda1290e2db0fd63cb0a8465e1282838bb 100644 (file)
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -209,7 +209,7 @@ virLastErrorObject(void)
     virErrorPtr err;
     err = virThreadLocalGet(&virLastErr);
     if (!err) {
-        if (VIR_ALLOC(err) < 0)
+        if (VIR_ALLOC_QUIET(err) < 0)
             return NULL;
         if (virThreadLocalSet(&virLastErr, err) < 0)
             VIR_FREE(err);
@@ -330,7 +330,7 @@ virSaveLastError(void)
     virErrorPtr to;
     int saved_errno = errno;
 
-    if (VIR_ALLOC(to) < 0)
+    if (VIR_ALLOC_QUIET(to) < 0)
         return NULL;
 
     virCopyLastError(to);

diff --git a/src/util/virlog.c b/src/util/virlog.c
index 064f8e8c30a3ee0bbb386204d7f71c9d33fdad8b..20af4ce5364da15402176e7f52fb9dbb898779c5 100644 (file)
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -204,14 +204,14 @@ virLogOnceInit(void)
         return -1;
 
     virLogLock();
-    if (VIR_ALLOC_N(virLogBuffer, virLogSize + 1) < 0) {
+    if (VIR_ALLOC_N_QUIET(virLogBuffer, virLogSize + 1) < 0) {
         /*
          * The debug buffer is not a critical component, allow startup
          * even in case of failure to allocate it in case of a
          * configuration mistake.
          */
         virLogSize = 64 * 1024;
-        if (VIR_ALLOC_N(virLogBuffer, virLogSize + 1) < 0) {
+        if (VIR_ALLOC_N_QUIET(virLogBuffer, virLogSize + 1) < 0) {
             pbm = "Failed to allocate debug buffer: deactivating debug log\n";
             virLogSize = 0;
         } else {
@@ -223,7 +223,7 @@ virLogOnceInit(void)
     virLogEnd = 0;
     virLogDefaultPriority = VIR_LOG_DEFAULT;
 
-    if (VIR_ALLOC(virLogRegex) >= 0) {
+    if (VIR_ALLOC_QUIET(virLogRegex) >= 0) {
         if (regcomp(virLogRegex, VIR_LOG_REGEX, REG_EXTENDED) != 0)
             VIR_FREE(virLogRegex);
     }
@@ -276,7 +276,7 @@ virLogSetBufferSize(int size)
     }
 
     virLogSize = size * 1024;
-    if (VIR_ALLOC_N(virLogBuffer, virLogSize + 1) < 0) {
+    if (VIR_ALLOC_N_QUIET(virLogBuffer, virLogSize + 1) < 0) {
         pbm = "Failed to allocate debug buffer of %d kB\n";
         virLogBuffer = oldLogBuffer;
         virLogSize = oldsize;
@@ -563,7 +563,7 @@ virLogDefineFilter(const char *match,
         goto cleanup;
     }
     i = virLogNbFilters;
-    if (VIR_REALLOC_N(virLogFilters, virLogNbFilters + 1)) {
+    if (VIR_REALLOC_N_QUIET(virLogFilters, virLogNbFilters + 1)) {
         i = -1;
         VIR_FREE(mdup);
         goto cleanup;
@@ -676,7 +676,7 @@ virLogDefineOutput(virLogOutputFunc f,
     }
 
     virLogLock();
-    if (VIR_REALLOC_N(virLogOutputs, virLogNbOutputs + 1)) {
+    if (VIR_REALLOC_N_QUIET(virLogOutputs, virLogNbOutputs + 1)) {
         VIR_FREE(ndup);
         goto cleanup;
     }

diff --git a/src/util/virpci.c b/src/util/virpci.c
index 54f771531d920c6312a26c54f0b5fdd2b9516d8f..c381ec6b8726a3e076bab0035a75afc4882daaa2 100644 (file)
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -2008,8 +2008,8 @@ virPCIGetIOMMUGroupAddressesAddOne(virPCIDeviceAddressPtr newDevAddr, void *opaq
 
     *copyAddr = *newDevAddr;
 
-    if (VIR_APPEND_ELEMENT(*addrList->iommuGroupDevices,
-                           *addrList->nIommuGroupDevices, copyAddr) < 0) {
+    if (VIR_APPEND_ELEMENT_QUIET(*addrList->iommuGroupDevices,
+                                 *addrList->nIommuGroupDevices, copyAddr) < 0) {
         virReportOOMError();
         goto cleanup;
     }

diff --git a/src/util/virthreadpthread.c b/src/util/virthreadpthread.c
index 75b5fd6fb6cd928d4e31a2160f51a3db75556355..ca841e49782591b577fc9c0146d56b6c1f745490 100644 (file)
--- a/src/util/virthreadpthread.c
+++ b/src/util/virthreadpthread.c
@@ -174,7 +174,7 @@ int virThreadCreate(virThreadPtr thread,
 
     if ((err = pthread_attr_init(&attr)) != 0)
         goto cleanup;
-    if (VIR_ALLOC(args) < 0) {
+    if (VIR_ALLOC_QUIET(args) < 0) {
         err = ENOMEM;
         goto cleanup;
     }

diff --git a/tests/commandhelper.c b/tests/commandhelper.c
index e4cc5d20b8be5d4f6a0c40cf74356ef2567ec680..d492c70ca47881b4e6aca255170c43cd36898196 100644 (file)
--- a/tests/commandhelper.c
+++ b/tests/commandhelper.c
@@ -35,6 +35,7 @@
 
 #ifndef WIN32
 
+# define VIR_FROM_THIS VIR_FROM_NONE
 
 static int envsort(const void *a, const void *b) {
     const char *const*astrptr = a;

diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c
index 520febacef81daca9f4b65f9418d199894f37765..b234b306a857abefe595bca1fc2856ca551a0814 100644 (file)
--- a/tests/networkxml2conftest.c
+++ b/tests/networkxml2conftest.c
@@ -16,6 +16,8 @@
 #include "network/bridge_driver.h"
 #include "virstring.h"
 
+#define VIR_FROM_THIS VIR_FROM_NONE
+
 static int
 testCompareXMLToConfFiles(const char *inxml, const char *outconf, dnsmasqCapsPtr caps)
 {

diff --git a/tests/test_conf.c b/tests/test_conf.c
index d5467e800b0961f3521941d48eb82185776e0877..acf41c6d105ba6806fa19b8f01bdff5664c1134c 100644 (file)
--- a/tests/test_conf.c
+++ b/tests/test_conf.c
@@ -20,7 +20,7 @@ int main(int argc, char **argv)
         goto cleanup;
     }
 
-    if (VIR_ALLOC_N(buffer, len) < 0) {
+    if (VIR_ALLOC_N_QUIET(buffer, len) < 0) {
         fprintf(stderr, "out of memory\n");
         goto cleanup;
     }

diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index 8e0c59e4590c3822756e256f44b18ccf2f437934..73e4a2d684fd0db669d90b2916f125522256723c 100644 (file)
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -37,6 +37,8 @@
 #include "viralloc.h"
 #include "virstring.h"
 
+#define VIR_FROM_THIS VIR_FROM_NONE
+
 static virCapsPtr caps;
 static virDomainXMLOptionPtr xmlopt;