External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-27 02:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

parallels: fix parallelsLoadNetworks

Browse Source 
Don't fail initialization of parallels driver if
parallelsLoadNetwork fails for optional networks.
This can happen when some of them are added manually
and configured incompletely. PCS requires only two networks
created automatically (named Host-Only and Bridged), others
are optional and their incompleteness can be ignored.

Signed-off-by: Maxim Nestratov <mnestratov@parallels.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Maxim Nestratov 2015-03-18 11:33:52 +03:00 committed by Michal Privoznik
parent 20111b6fdf
commit 725bffa782
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/parallels/parallels_network.c
View File

@ -180,10 +180,11 @@ static int parallelsGetHostOnlyNetInfo(virNetworkDefPtr def, const char *name)
return ret;
}
static virNetworkObjPtr
static int
parallelsLoadNetwork(parallelsConnPtr privconn, virJSONValuePtr jobj)
{
virNetworkObjPtr net;
int ret = -1;
virNetworkObjPtr net = NULL;
virNetworkDefPtr def;
const char *tmp;
/* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */
@ -214,13 +215,25 @@ parallelsLoadNetwork(parallelsConnPtr privconn, virJSONValuePtr jobj)
if (STREQ(tmp, PARALLELS_BRIDGED_NETWORK_TYPE)) {
def->forward.type = VIR_NETWORK_FORWARD_BRIDGE;
if (parallelsGetBridgedNetInfo(def, jobj) < 0)
if (parallelsGetBridgedNetInfo(def, jobj) < 0) {
/* Only mandatory networks are required to be configured completely */
if (STRNEQ(def->name, PARALLELS_REQUIRED_BRIDGED_NETWORK))
ret = 0;
goto cleanup;
}
} else if (STREQ(tmp, PARALLELS_HOSTONLY_NETWORK_TYPE)) {
def->forward.type = VIR_NETWORK_FORWARD_NONE;
if (parallelsGetHostOnlyNetInfo(def, def->name) < 0)
if (parallelsGetHostOnlyNetInfo(def, def->name) < 0) {
/* Only mandatory networks are required to be configured completely */
if (STRNEQ(def->name, PARALLELS_REQUIRED_HOSTONLY_NETWORK))
ret = 0;
goto cleanup;
}
} else {
parallelsParseError();
goto cleanup;
@ -228,16 +241,18 @@ parallelsLoadNetwork(parallelsConnPtr privconn, virJSONValuePtr jobj)
if (!(net = virNetworkAssignDef(privconn->networks, def, false)))
goto cleanup;
def = NULL;
net->active = 1;
net->autostart = 1;
return net;
ret = 0;
cleanup:
virNetworkObjEndAPI(&net);
virNetworkDefFree(def);
return NULL;
return ret;
}
static virNetworkObjPtr
static int
parallelsAddRoutedNetwork(parallelsConnPtr privconn)
{
virNetworkObjPtr net = NULL;
@ -258,24 +273,23 @@ parallelsAddRoutedNetwork(parallelsConnPtr privconn)
}
def->uuid_specified = 1;
if (!(net = virNetworkAssignDef(privconn->networks, def, false))) {
virNetworkDefFree(def);
if (!(net = virNetworkAssignDef(privconn->networks, def, false)))
goto cleanup;
}
net->active = 1;
net->autostart = 1;
virNetworkObjEndAPI(&net);
return net;
return 0;
cleanup:
virNetworkDefFree(def);
return NULL;
return -1;
}
static int parallelsLoadNetworks(parallelsConnPtr privconn)
{
virJSONValuePtr jobj, jobj2;
virNetworkObjPtr net = NULL;
int ret = -1;
int count;
size_t i;
@ -300,22 +314,17 @@ static int parallelsLoadNetworks(parallelsConnPtr privconn)
goto cleanup;
}
net = parallelsLoadNetwork(privconn, jobj2);
if (!net)
if (parallelsLoadNetwork(privconn, jobj2) < 0)
goto cleanup;
else
virNetworkObjEndAPI(&net);
}
if (!(net = parallelsAddRoutedNetwork(privconn)))
if (parallelsAddRoutedNetwork(privconn) < 0)
goto cleanup;
ret = 0;
cleanup:
virJSONValueFree(jobj);
virNetworkObjEndAPI(&net);
return ret;
}