External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: virDomainNetUpdate() to void

Browse Source 
virDomainNetUpdate() return value is invariant, so change it type
and remove all dependent checks.

Signed-off-by: Artem Chernyshev <artem.chernyshev@red-soft.ru>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Artem Chernyshev 2024-01-04 03:17:00 +03:00 committed by Michal Privoznik
parent 270e363046
commit 88903f9abf
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/conf/domain_conf.c
View File

@ -14690,7 +14690,7 @@ virDomainNetRemoveByObj(virDomainDef *def, virDomainNetDef *net)
} }
int void
virDomainNetUpdate(virDomainDef *def, virDomainNetUpdate(virDomainDef *def,
size_t netidx, size_t netidx,
virDomainNetDef *newnet) virDomainNetDef *newnet)
@ -14725,7 +14725,6 @@ virDomainNetUpdate(virDomainDef *def,
} }
def->nets[netidx] = newnet; def->nets[netidx] = newnet;
return 0;
} }

2
src/conf/domain_conf.h
View File

@ -3891,7 +3891,7 @@ virDomainNetDef *virDomainNetFind(virDomainDef *def, const char *device);
virDomainNetDef *virDomainNetFindByName(virDomainDef *def, const char *ifname); virDomainNetDef *virDomainNetFindByName(virDomainDef *def, const char *ifname);
bool virDomainHasNet(virDomainDef *def, virDomainNetDef *net); bool virDomainHasNet(virDomainDef *def, virDomainNetDef *net);
int virDomainNetInsert(virDomainDef *def, virDomainNetDef *net); int virDomainNetInsert(virDomainDef *def, virDomainNetDef *net);
int virDomainNetUpdate(virDomainDef *def, size_t netidx, virDomainNetDef *newnet); void virDomainNetUpdate(virDomainDef *def, size_t netidx, virDomainNetDef *newnet);
bool virDomainNetBackendIsEqual(virDomainNetBackend *src, bool virDomainNetBackendIsEqual(virDomainNetBackend *src,
virDomainNetBackend *dst); virDomainNetBackend *dst);
int virDomainNetDHCPInterfaces(virDomainDef *def, virDomainInterfacePtr **ifaces); int virDomainNetDHCPInterfaces(virDomainDef *def, virDomainInterfacePtr **ifaces);

3
src/lxc/lxc_driver.c
View File

@ -3084,8 +3084,7 @@ lxcDomainUpdateDeviceConfig(virDomainDef *vmdef,
false) < 0) false) < 0)
return -1; return -1;
if (virDomainNetUpdate(vmdef, idx, net) < 0) virDomainNetUpdate(vmdef, idx, net);
return -1;
virDomainNetDefFree(oldDev.data.net); virDomainNetDefFree(oldDev.data.net);
dev->data.net = NULL; dev->data.net = NULL;

3
src/qemu/qemu_driver.c
View File

@ -7145,8 +7145,7 @@ qemuDomainUpdateDeviceConfig(virDomainDef *vmdef,
false) < 0) false) < 0)
return -1; return -1;
if (virDomainNetUpdate(vmdef, pos, net)) virDomainNetUpdate(vmdef, pos, net);
return -1;
virDomainNetDefFree(oldDev.data.net); virDomainNetDefFree(oldDev.data.net);
dev->data.net = NULL; dev->data.net = NULL;