check if lxc.netdev.link is set for macvlan

Ensure that lxc.netdev.link is specified for macvlan interfaces, since it's required. While at it, simplify logic in instanciate_macvlan(): remove unnecessary-complicating goto statements (we only need to perform a cleanup in one place) Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

check if lxc.netdev.link is set for macvlan
d957ae2d · Michael Tokarev · Daniel Lezcano · 734915ac · d957ae2d
Commit d957ae2d authored Nov 20, 2009 by Michael Tokarev Committed by Daniel Lezcano Nov 20, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 10 deletions

conf.c src/lxc/conf.c +10 -10

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -893,10 +893,15 @@ out_delete:
 	lxc_device_delete(veth1);
 	goto out;
 }
+
 static int instanciate_macvlan(struct lxc_netdev *netdev)
 {
 	char peer[IFNAMSIZ];
-	int ret = -1;
+
+	if (!netdev->link) {
+		ERROR("no link specified for macvlan netdev");
+		return -1;
+	}

 	snprintf(peer, sizeof(peer), "mcXXXXXX");

@@ -910,24 +915,19 @@ static int instanciate_macvlan(struct lxc_netdev *netdev)
 	if (lxc_macvlan_create(netdev->link, peer)) {
 		ERROR("failed to create macvlan interface '%s' on '%s'",
 		      peer, netdev->link);
-		goto out;
+		return -1;
 	}

 	netdev->ifindex = if_nametoindex(peer);
 	if (!netdev->ifindex) {
 		ERROR("failed to retrieve the index for %s", peer);
-		goto out_delete;
+		lxc_device_delete(peer);
+		return -1;
 	}

 	DEBUG("instanciated macvlan '%s', index is '%d'", peer, netdev->ifindex);

-	ret = 0;
-out:
-	return ret;
-
-out_delete:
-	lxc_device_delete(peer);
-	goto out;
+	return 0;
 }

 static int instanciate_phys(struct lxc_netdev *netdev)