External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-30 04:21:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: virdomainobjlist: Remove return value from virDomainObjListCollect

Browse Source 
The function can't fail so there's no point in returning anything.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2022-08-04 15:29:53 +02:00
parent cd3599c876
commit e88593ba39
5 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/conf/virdomainobjlist.c
View File

@ -964,7 +964,7 @@ virDomainObjListFilter(virDomainObj ***list,
} }
int void
virDomainObjListCollect(virDomainObjList *domlist, virDomainObjListCollect(virDomainObjList *domlist,
virConnectPtr conn, virConnectPtr conn,
virDomainObj ***vms, virDomainObj ***vms,
@ -974,8 +974,6 @@ virDomainObjListCollect(virDomainObjList *domlist,
{ {
virDomainObjListCollectAll(domlist, vms, nvms); virDomainObjListCollectAll(domlist, vms, nvms);
virDomainObjListFilter(vms, nvms, conn, filter, flags); virDomainObjListFilter(vms, nvms, conn, filter, flags);
return 0;
} }
@ -1046,8 +1044,7 @@ virDomainObjListExport(virDomainObjList *domlist,
size_t i; size_t i;
int ret = -1; int ret = -1;
if (virDomainObjListCollect(domlist, conn, &vms, &nvms, filter, flags) < 0) virDomainObjListCollect(domlist, conn, &vms, &nvms, filter, flags);
return -1;
if (domains) { if (domains) {
doms = g_new0(virDomainPtr, nvms + 1); doms = g_new0(virDomainPtr, nvms + 1);

2
src/conf/virdomainobjlist.h
View File

@ -149,7 +149,7 @@ void
virDomainObjListCollectAll(virDomainObjList *domlist, virDomainObjListCollectAll(virDomainObjList *domlist,
virDomainObj ***vms, virDomainObj ***vms,
size_t *nvms); size_t *nvms);
int void
virDomainObjListCollect(virDomainObjList *doms, virDomainObjListCollect(virDomainObjList *doms,
virConnectPtr conn, virConnectPtr conn,
virDomainObj ***vms, virDomainObj ***vms,

5
src/qemu/qemu_driver.c
View File

@ -18666,10 +18666,9 @@ qemuConnectGetAllDomainStats(virConnectPtr conn,
lflags, true) < 0) lflags, true) < 0)
return -1; return -1;
} else { } else {
if (virDomainObjListCollect(driver->domains, conn, &vms, &nvms, virDomainObjListCollect(driver->domains, conn, &vms, &nvms,
virConnectGetAllDomainStatsCheckACL, virConnectGetAllDomainStatsCheckACL,
lflags) < 0) lflags);
return -1;
} }
tmpstats = g_new0(virDomainStatsRecordPtr, nvms + 1); tmpstats = g_new0(virDomainStatsRecordPtr, nvms + 1);

4
src/test/test_driver.c
View File

@ -9923,9 +9923,7 @@ testConnectGetAllDomainStats(virConnectPtr conn,
&nvms, NULL, lflags, true) < 0) &nvms, NULL, lflags, true) < 0)
return -1; return -1;
} else { } else {
if (virDomainObjListCollect(driver->domains, conn, &vms, &nvms, virDomainObjListCollect(driver->domains, conn, &vms, &nvms, NULL, lflags);
NULL, lflags) < 0)
return -1;
} }
tmpstats = g_new0(virDomainStatsRecordPtr, nvms + 1); tmpstats = g_new0(virDomainStatsRecordPtr, nvms + 1);

5
src/vz/vz_driver.c
View File

@ -3771,10 +3771,9 @@ vzConnectGetAllDomainStats(virConnectPtr conn,
lflags, true) < 0) lflags, true) < 0)
return -1; return -1;
} else { } else {
if (virDomainObjListCollect(driver->domains, conn, &doms, &ndoms, virDomainObjListCollect(driver->domains, conn, &doms, &ndoms,
virConnectGetAllDomainStatsCheckACL, virConnectGetAllDomainStatsCheckACL,
lflags) < 0) lflags);
return -1;
} }
tmpstats = g_new0(virDomainStatsRecordPtr, ndoms + 1); tmpstats = g_new0(virDomainStatsRecordPtr, ndoms + 1);