External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 12:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

lxc: remove domain definition from lxc network struct

Browse Source 
Domain definition is useless now inside network structure. This pointer
was required because new network definition was being added each time
that a new network type appeared. So, this should be processed into
old function `lxcNetworkParseDataType()`. Now, as it was moved to an
array, it can be handle together each interface pointer.

Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Julio Faracco 2020-02-02 22:28:34 -03:00 committed by Michal Privoznik
parent 0da46e30a0
commit 6cf9577498
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lxc/lxc_native.c
View File

@ -414,7 +414,6 @@ lxcCreateHostdevDef(int mode, int type, const char *data)
typedef struct _lxcNetworkParseData lxcNetworkParseData; typedef struct _lxcNetworkParseData lxcNetworkParseData;
typedef lxcNetworkParseData *lxcNetworkParseDataPtr; typedef lxcNetworkParseData *lxcNetworkParseDataPtr;
struct _lxcNetworkParseData { struct _lxcNetworkParseData {
virDomainDefPtr def;
char *type; char *type;
char *link; char *link;
char *mac; char *mac;
@ -470,7 +469,7 @@ lxcAddNetworkRouteDefinition(const char *address,
} }
static int static int
lxcAddNetworkDefinition(lxcNetworkParseData *data) lxcAddNetworkDefinition(virDomainDefPtr def, lxcNetworkParseData *data)
{ {
virDomainNetDefPtr net = NULL; virDomainNetDefPtr net = NULL;
virDomainHostdevDefPtr hostdev = NULL; virDomainHostdevDefPtr hostdev = NULL;
@ -518,9 +517,9 @@ lxcAddNetworkDefinition(lxcNetworkParseData *data)
&hostdev->source.caps.u.net.ip.nroutes) < 0) &hostdev->source.caps.u.net.ip.nroutes) < 0)
goto error; goto error;
if (VIR_EXPAND_N(data->def->hostdevs, data->def->nhostdevs, 1) < 0) if (VIR_EXPAND_N(def->hostdevs, def->nhostdevs, 1) < 0)
goto error; goto error;
data->def->hostdevs[data->def->nhostdevs - 1] = hostdev; def->hostdevs[def->nhostdevs - 1] = hostdev;
} else { } else {
if (!(net = lxcCreateNetDef(data->type, data->link, data->mac, if (!(net = lxcCreateNetDef(data->type, data->link, data->mac,
data->flag, data->macvlanmode, data->flag, data->macvlanmode,
@ -542,9 +541,9 @@ lxcAddNetworkDefinition(lxcNetworkParseData *data)
&net->guestIP.nroutes) < 0) &net->guestIP.nroutes) < 0)
goto error; goto error;
if (VIR_EXPAND_N(data->def->nets, data->def->nnets, 1) < 0) if (VIR_EXPAND_N(def->nets, def->nnets, 1) < 0)
goto error; goto error;
data->def->nets[data->def->nnets - 1] = net; def->nets[def->nnets - 1] = net;
} }
return 1; return 1;
@ -766,9 +765,8 @@ lxcConvertNetworkSettings(virDomainDefPtr def, virConfPtr properties)
for (i = 0; i < networks.ndata; i++) { for (i = 0; i < networks.ndata; i++) {
lxcNetworkParseDataPtr data = networks.parseData[i]; lxcNetworkParseDataPtr data = networks.parseData[i];
data->def = def;
status = lxcAddNetworkDefinition(data); status = lxcAddNetworkDefinition(def, data);
if (status < 0) if (status < 0)
goto error; goto error;