From: Cédric Bosdonnat <cbosdonnat@suse.com>
Date: Wed, 12 Nov 2014 08:30:09 +0000 (+0100)
Subject: Openvz --ipadd can be provided multiple times
X-Git-Tag: v1.2.12-rc1~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4e86390;p=thirdparty%2Flibvirt.git

Openvz --ipadd can be provided multiple times

Vzctl man page says that --ipadd can be provided multiple times to add
several IP addresses. Looping over the configured ip addresses to add
one --ipadd for each. This would even handle the multiple IPs handled
by openvz_conf.c
---

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index e45ed7d16e..c144ecacf3 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -905,9 +905,13 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid,
         virCommandAddArgBuffer(cmd, &buf);
     } else if (net->type == VIR_DOMAIN_NET_TYPE_ETHERNET &&
               net->nips > 0) {
+        size_t i;
+
         /* --ipadd ip */
-        char *ipStr = virSocketAddrFormat(&net->ips[0]->address);
-        virCommandAddArgList(cmd, "--ipadd", ipStr, NULL);
+        for (i = 0; i < net->nips; i++) {
+            char *ipStr = virSocketAddrFormat(&net->ips[i]->address);
+            virCommandAddArgList(cmd, "--ipadd", ipStr, NULL);
+        }
     }
 
     /* TODO: processing NAT and physical device */