Signed-off-by: Tim Wiederhake <twiederh@xxxxxxxxxx> --- src/util/viralloc.h | 4 ---- tests/virfilewrapper.c | 4 ++-- tests/virpcimock.c | 7 +++---- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/util/viralloc.h b/src/util/viralloc.h index a50cd5d632..a581a2935e 100644 --- a/src/util/viralloc.h +++ b/src/util/viralloc.h @@ -303,10 +303,6 @@ void virDisposeString(char **strptr) VIR_TYPEMATCH(ptr, &(newelem)), \ &(newelem), false, true)) -/* Quiet version of macros above */ -#define VIR_APPEND_ELEMENT_QUIET(ptr, count, newelem) \ - VIR_APPEND_ELEMENT(ptr, count, newelem) - /** * VIR_DELETE_ELEMENT: * @ptr: pointer to array of objects (*not* ptr to ptr) diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c index 0500a3617e..ca7274bfe7 100644 --- a/tests/virfilewrapper.c +++ b/tests/virfilewrapper.c @@ -74,8 +74,8 @@ virFileWrapperAddPrefix(const char *prefix, init_syms(); - if (VIR_APPEND_ELEMENT_QUIET(prefixes, nprefixes, prefix) < 0 || - VIR_APPEND_ELEMENT_QUIET(overrides, noverrides, override) < 0) { + if (VIR_APPEND_ELEMENT(prefixes, nprefixes, prefix) < 0 || + VIR_APPEND_ELEMENT(overrides, noverrides, override) < 0) { VIR_FREE(prefixes); VIR_FREE(overrides); fprintf(stderr, "Unable to add path override for '%s'\n", prefix); diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 30a31cb5de..b29f34bc4f 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -433,8 +433,7 @@ pci_device_create_iommu(const struct pciDevice *dev, iommuGroup->iommu = dev->iommuGroup; iommuGroup->nDevicesBoundToVFIO = 0; /* No device bound to VFIO by default */ - if (VIR_APPEND_ELEMENT_QUIET(pciIommuGroups, npciIommuGroups, - iommuGroup) < 0) + if (VIR_APPEND_ELEMENT(pciIommuGroups, npciIommuGroups, iommuGroup) < 0) ABORT_OOM(); } @@ -550,7 +549,7 @@ pci_device_new_from_stub(const struct pciDevice *data) if (pci_device_autobind(dev) < 0) ABORT("Unable to bind: %s", devid); - if (VIR_APPEND_ELEMENT_QUIET(pciDevices, nPCIDevices, dev) < 0) + if (VIR_APPEND_ELEMENT(pciDevices, nPCIDevices, dev) < 0) ABORT_OOM(); } @@ -723,7 +722,7 @@ pci_driver_new(const char *name, ...) make_file(driverpath, "bind", NULL, -1); make_file(driverpath, "unbind", NULL, -1); - if (VIR_APPEND_ELEMENT_QUIET(pciDrivers, nPCIDrivers, driver) < 0) + if (VIR_APPEND_ELEMENT(pciDrivers, nPCIDrivers, driver) < 0) ABORT_OOM(); } -- 2.26.2