shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 06:50:22 +03:00
Code Releases Activity

conf: change virDomainNetInsert() to return void

Browse Source 
It can't fail.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Laine Stump 2025-02-11 16:49:17 -05:00
parent 9bd83854f7
commit 5c5135849b
5 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf/domain_conf.c
View File

@ -14894,14 +14894,14 @@ virDomainDiskRemoveByName(virDomainDef *def, const char *name)
return virDomainDiskRemove(def, idx);
}
int virDomainNetInsert(virDomainDef *def, virDomainNetDef *net)
void
virDomainNetInsert(virDomainDef *def, virDomainNetDef *net)
{
/* hostdev net devices must also exist in the hostdevs array */
if (net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV)
virDomainHostdevInsert(def, &net->data.hostdev.def);
VIR_APPEND_ELEMENT(def->nets, def->nnets, net);
return 0;
}
/**

2
src/conf/domain_conf.h
View File

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

10
src/libxl/libxl_driver.c
View File

@ -3508,7 +3508,6 @@ static int
libxlDomainAttachDeviceConfig(virDomainDef *vmdef, virDomainDeviceDef *dev)
{
virDomainDiskDef *disk;
virDomainNetDef *net;
virDomainHostdevDef *hostdev;
virDomainControllerDef *controller;
virDomainHostdevDef *found;
@ -3542,16 +3541,13 @@ libxlDomainAttachDeviceConfig(virDomainDef *vmdef, virDomainDeviceDef *dev)
break;
case VIR_DOMAIN_DEVICE_NET:
net = dev->data.net;
if (virDomainHasNet(vmdef, net)) {
if (virDomainHasNet(vmdef, dev->data.net)) {
virReportError(VIR_ERR_INVALID_ARG,
_("network device with mac %1$s already exists"),
virMacAddrFormat(&net->mac, mac));
virMacAddrFormat(&dev->data.net->mac, mac));
return -1;
}
if (virDomainNetInsert(vmdef, net))
return -1;
dev->data.net = NULL;
virDomainNetInsert(vmdef, g_steal_pointer(&dev->data.net));
break;
case VIR_DOMAIN_DEVICE_HOSTDEV:

6
src/lxc/lxc_driver.c
View File

@ -2961,7 +2961,6 @@ lxcDomainAttachDeviceConfig(virDomainDef *vmdef,
{
int ret = -1;
virDomainDiskDef *disk;
virDomainNetDef *net;
virDomainHostdevDef *hostdev;
switch (dev->type) {
@ -2979,10 +2978,7 @@ lxcDomainAttachDeviceConfig(virDomainDef *vmdef,
break;
case VIR_DOMAIN_DEVICE_NET:
net = dev->data.net;
if (virDomainNetInsert(vmdef, net) < 0)
return -1;
dev->data.net = NULL;
virDomainNetInsert(vmdef, g_steal_pointer(&dev->data.net));
ret = 0;
break;

6
src/qemu/qemu_driver.c
View File

@ -6682,7 +6682,6 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef,
virDomainXMLOption *xmlopt)
{
virDomainDiskDef *disk;
virDomainNetDef *net;
virDomainSoundDef *sound;
virDomainHostdevDef *hostdev;
virDomainLeaseDef *lease;
@ -6709,10 +6708,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef,
break;
case VIR_DOMAIN_DEVICE_NET:
net = dev->data.net;
if (virDomainNetInsert(vmdef, net))
return -1;
dev->data.net = NULL;
virDomainNetInsert(vmdef, g_steal_pointer(&dev->data.net));
break;
case VIR_DOMAIN_DEVICE_SOUND: