External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: alloc: Reimplement VIR_APPEND_ELEMENT_QUIET using virAppendElement

Browse Source 
For now it was an alias to VIR_APPEND_ELEMENT. Use virAppendElement
directly until VIR_APPEND_ELEMENT is refactored too and we'll be able to
get rid of VIR_APPEND_ELEMENT_QUIET completely.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2021-08-04 09:25:23 +02:00
parent 592517636f
commit 8c22b28dbe
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/util/viralloc.h
View File

@ -247,7 +247,8 @@ int virDeleteElementsN(void *ptrptr, size_t size, size_t at, size_t *countptr,
/* Quiet version of macros above */ /* Quiet version of macros above */
#define VIR_APPEND_ELEMENT_QUIET(ptr, count, newelem) \ #define VIR_APPEND_ELEMENT_QUIET(ptr, count, newelem) \
VIR_APPEND_ELEMENT(ptr, count, newelem) virAppendElement(&(ptr), sizeof(*(ptr)), &(count), \
VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), true, false)
/** /**
* VIR_DELETE_ELEMENT: * VIR_DELETE_ELEMENT:

9
tests/virfilewrapper.c
View File

@ -78,13 +78,8 @@ virFileWrapperAddPrefix(const char *prefix,
init_syms(); init_syms();
if (VIR_APPEND_ELEMENT_QUIET(prefixes, nprefixes, prefix) < 0 || VIR_APPEND_ELEMENT_QUIET(prefixes, nprefixes, prefix);
VIR_APPEND_ELEMENT_QUIET(overrides, noverrides, override) < 0) { VIR_APPEND_ELEMENT_QUIET(overrides, noverrides, override);
VIR_FREE(prefixes);
VIR_FREE(overrides);
fprintf(stderr, "Unable to add path override for '%s'\n", prefix);
abort();
}
} }

10
tests/virpcimock.c
View File

@ -428,9 +428,7 @@ pci_device_create_iommu(const struct pciDevice *dev,
iommuGroup->iommu = dev->iommuGroup; iommuGroup->iommu = dev->iommuGroup;
iommuGroup->nDevicesBoundToVFIO = 0; /* No device bound to VFIO by default */ iommuGroup->nDevicesBoundToVFIO = 0; /* No device bound to VFIO by default */
if (VIR_APPEND_ELEMENT_QUIET(pciIommuGroups, npciIommuGroups, VIR_APPEND_ELEMENT_QUIET(pciIommuGroups, npciIommuGroups, iommuGroup);
iommuGroup) < 0)
ABORT_OOM();
} }
@ -544,8 +542,7 @@ pci_device_new_from_stub(const struct pciDevice *data)
if (pci_device_autobind(dev) < 0) if (pci_device_autobind(dev) < 0)
ABORT("Unable to bind: %s", devid); ABORT("Unable to bind: %s", devid);
if (VIR_APPEND_ELEMENT_QUIET(pciDevices, nPCIDevices, dev) < 0) VIR_APPEND_ELEMENT_QUIET(pciDevices, nPCIDevices, dev);
ABORT_OOM();
} }
static struct pciDevice * static struct pciDevice *
@ -716,8 +713,7 @@ pci_driver_new(const char *name, ...)
make_file(driverpath, "bind", NULL, -1); make_file(driverpath, "bind", NULL, -1);
make_file(driverpath, "unbind", NULL, -1); make_file(driverpath, "unbind", NULL, -1);
if (VIR_APPEND_ELEMENT_QUIET(pciDrivers, nPCIDrivers, driver) < 0) VIR_APPEND_ELEMENT_QUIET(pciDrivers, nPCIDrivers, driver);
ABORT_OOM();
} }
static struct pciDriver * static struct pciDriver *