External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-05 08:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

libxl: adjust handling of libxl_device_nic objects

Browse Source 
libxl objects are supposed to be initialized and disposed. Adjust
libxlMakeNic to use an already initialized object owned by the caller.

Adjust libxlMakeNicList to initialize the list of objects, before they
are filled by libxlMakeNic. The libxl_domain_config object passed to
libxlMakeNicList is owned by the caller and will be disposed with
libxl_domain_config_dispose, which also disposes embedded objects such
as libxl_device_nic.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Acked-by: Olaf Hering <olaf@aepfle.de>
This commit is contained in:
Jim Fehlig 2021-05-26 14:05:05 -06:00
parent 9d225ea284
commit 48b9932352
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libxl/libxl_conf.c
View File

@ -1313,8 +1313,6 @@ libxlMakeNic(virDomainDef *def,
return -1;
}
libxl_device_nic_init(x_nic);
virMacAddrGetRaw(&l_nic->mac, x_nic->mac);
/*
@ -1502,6 +1500,7 @@ libxlMakeNicList(virDomainDef *def, libxl_domain_config *d_config)
size_t nnics = def->nnets;
libxl_device_nic *x_nics;
size_t i, nvnics = 0;
int ret = -1;
x_nics = g_new0(libxl_device_nic, nnics);
@ -1509,8 +1508,9 @@ libxlMakeNicList(virDomainDef *def, libxl_domain_config *d_config)
if (virDomainNetGetActualType(l_nics[i]) == VIR_DOMAIN_NET_TYPE_HOSTDEV)
continue;
libxl_device_nic_init(&x_nics[nvnics]);
if (libxlMakeNic(def, l_nics[i], &x_nics[nvnics], false))
goto error;
goto out;
/*
* The devid (at least right now) will not get initialized by
* libxl in the setup case but is required for starting the
@ -1521,18 +1521,14 @@ libxlMakeNicList(virDomainDef *def, libxl_domain_config *d_config)
nvnics++;
}
ret = 0;
out:
VIR_SHRINK_N(x_nics, nnics, nnics - nvnics);
d_config->nics = x_nics;
d_config->num_nics = nvnics;
return 0;
error:
for (i = 0; i < nnics; i++)
libxl_device_nic_dispose(&x_nics[i]);
VIR_FREE(x_nics);
return -1;
return ret;
}
int