External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

lxc: Introduce lxcNetworkParseDataType

Browse Source 
Extract out the network "type" processing into it's own method
rather than inline within lxcNetworkParseDataSuffix.

Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Julio Faracco 2019-02-18 16:09:09 -03:00 committed by John Ferlan
parent f7fd10e5f8
commit 087a7c9a88
1 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/lxc/lxc_native.c
View File

@ -553,6 +553,39 @@ lxcAddNetworkDefinition(lxcNetworkParseData *data)
} }
static int
lxcNetworkParseDataType(virConfValuePtr value,
lxcNetworkParseData *parseData)
{
virDomainDefPtr def = parseData->def;
size_t networks = parseData->networks;
bool privnet = parseData->privnet;
int status;
/* Store the previous NIC */
status = lxcAddNetworkDefinition(parseData);
if (status < 0)
return -1;
else if (status > 0)
networks++;
else if (parseData->type != NULL && STREQ(parseData->type, "none"))
privnet = false;
/* clean NIC to store a new one */
memset(parseData, 0, sizeof(*parseData));
parseData->def = def;
parseData->networks = networks;
parseData->privnet = privnet;
/* Keep the new value */
parseData->type = value->str;
return 0;
}
static int static int
lxcNetworkParseDataIPs(const char *name, lxcNetworkParseDataIPs(const char *name,
virConfValuePtr value, virConfValuePtr value,
@ -597,32 +630,9 @@ lxcNetworkParseDataSuffix(const char *name,
virConfValuePtr value, virConfValuePtr value,
lxcNetworkParseData *parseData) lxcNetworkParseData *parseData)
{ {
int status;
if (STREQ(name, "type")) { if (STREQ(name, "type")) {
virDomainDefPtr def = parseData->def; if (lxcNetworkParseDataType(value, parseData) < 0)
size_t networks = parseData->networks;
bool privnet = parseData->privnet;
/* Store the previous NIC */
status = lxcAddNetworkDefinition(parseData);
if (status < 0)
return -1; return -1;
else if (status > 0)
networks++;
else if (parseData->type != NULL && STREQ(parseData->type, "none"))
privnet = false;
/* clean NIC to store a new one */
memset(parseData, 0, sizeof(*parseData));
parseData->def = def;
parseData->networks = networks;
parseData->privnet = privnet;
/* Keep the new value */
parseData->type = value->str;
} }
else if (STREQ(name, "link")) else if (STREQ(name, "link"))
parseData->link = value->str; parseData->link = value->str;