External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

virCloseCallbacksGetForConn: Remove OOM handling

Browse Source 
VIR_EXPAND_N will abort so we can simplify the hash iterator.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
This commit is contained in:
Peter Krempa 2021-02-23 17:17:10 +01:00
parent 9339163894
commit 22dbafe092
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hypervisor/virclosecallbacks.c
View File

@ -241,7 +241,6 @@ struct _virCloseCallbacksList {
struct virCloseCallbacksData { struct virCloseCallbacksData {
virConnectPtr conn; virConnectPtr conn;
virCloseCallbacksListPtr list; virCloseCallbacksListPtr list;
bool oom;
}; };
static int static int
@ -263,11 +262,7 @@ virCloseCallbacksGetOne(void *payload,
if (data->conn != closeDef->conn || !closeDef->cb) if (data->conn != closeDef->conn || !closeDef->cb)
return 0; return 0;
if (VIR_EXPAND_N(data->list->entries, ignore_value(VIR_EXPAND_N(data->list->entries, data->list->nentries, 1));
data->list->nentries, 1) < 0) {
data->oom = true;
return 0;
}
memcpy(data->list->entries[data->list->nentries - 1].uuid, memcpy(data->list->entries[data->list->nentries - 1].uuid,
uuid, VIR_UUID_BUFLEN); uuid, VIR_UUID_BUFLEN);
@ -286,17 +281,9 @@ virCloseCallbacksGetForConn(virCloseCallbacksPtr closeCallbacks,
data.conn = conn; data.conn = conn;
data.list = list; data.list = list;
data.oom = false;
virHashForEach(closeCallbacks->list, virCloseCallbacksGetOne, &data); virHashForEach(closeCallbacks->list, virCloseCallbacksGetOne, &data);
if (data.oom) {
VIR_FREE(list->entries);
VIR_FREE(list);
virReportOOMError();
return NULL;
}
return list; return list;
} }