提交 f928284b 编写于 作者: D Daniel P. Berrange 提交者: Cole Robinson

Ensure failure to create macvtap device aborts LXC start

A mistaken initialization of 'ret' caused failure to create
macvtap devices to be ignored. The libvirt_lxc process
would later fail to start due to missing devices

Also make sure code checks '< 0' and not '!= 0' since only
-1 is considered an error condition
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
(cherry picked from commit 43db9cf4)
上级 74aa3ffe
......@@ -360,7 +360,7 @@ static int virLXCProcessSetupInterfaceDirect(virConnectPtr conn,
unsigned int *nveths,
char ***veths)
{
int ret = 0;
int ret = -1;
char *res_ifname = NULL;
virLXCDriverPtr driver = conn->privateData;
virNetDevBandwidthPtr bw;
......@@ -539,10 +539,10 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn,
}
}
ret= 0;
ret = 0;
cleanup:
if (ret != 0) {
if (ret < 0) {
for (i = 0 ; i < def->nnets ; i++) {
virDomainNetDefPtr iface = def->nets[i];
virNetDevVPortProfilePtr vport = virDomainNetGetActualVirtPortProfile(iface);
......@@ -1031,7 +1031,7 @@ int virLXCProcessStart(virConnectPtr conn,
}
}
if (virLXCProcessSetupInterfaces(conn, vm->def, &nveths, &veths) != 0)
if (virLXCProcessSetupInterfaces(conn, vm->def, &nveths, &veths) < 0)
goto cleanup;
/* Save the configuration for the controller */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册