* src/openvz_driver.c: fix the mac addresses generation for OpenVZ veth

  devices, patch by Evgeniy Sokolov
* docs/apps.html: regenerated fixing a typo
Daniel

diff --git a/ChangeLog b/ChangeLog
index 36b497588e56e90f00bd6046efccb43e6ce2cee9..049c9c727631272496308071d553df057d4ce12e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan  7 11:54:06 CET 2009 Daniel Veillard <veillard@redhat.com>
+
+       * src/openvz_driver.c: fix the mac addresses generation for 
+         OpenVZ veth devices, patch by Evgeniy Sokolov
+
 Wed Jan  7 11:38:04 CET 2009 Daniel Veillard <veillard@redhat.com>
 
        * src/libvirt_private.syms src/qemu_driver.c src/test.c

diff --git a/docs/apps.html b/docs/apps.html
index a4f9a4e8db6d0ce9aeedae5d0eab7b8b49aa5fa3..9bc95d160fc2a9014d9294416890139f6e2630cb 100644 (file)
--- a/docs/apps.html
+++ b/docs/apps.html
@@ -141,7 +141,7 @@
       </dd></dl>
         <h2>Monitoring plugins</h2>
         <dl><dt><a href="http://honk.sigxcpu.org/projects/libvirt/#munin">for munin</a></dt><dd>
-       The plugins provided by Guido Günther allows to monitor various things
+       The plugins provided by Guido Günther allow to monitor various things
         like network and block I/O with
         <a href="http://munin.projects.linpro.no/">Munin</a>.
       </dd><dt><a href="http://collectd.org/plugins/libvirt.shtml">for collectd</a></dt><dd>

diff --git a/src/openvz_driver.c b/src/openvz_driver.c
index 284ffb2e6db486c14850e8d7802b9bd4d0c34ead..bec0eb870b500a8db06ddc0fa7f0412b5249b8e1 100644 (file)
--- a/src/openvz_driver.c
+++ b/src/openvz_driver.c
@@ -473,6 +473,8 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid,
     int rc = 0, narg;
     const char *prog[OPENVZ_MAX_ARG];
     char macaddr[VIR_MAC_STRING_BUFLEN];
+    unsigned char host_mac[VIR_MAC_BUFLEN];
+    char host_macaddr[VIR_MAC_STRING_BUFLEN];
     struct openvz_driver *driver =  conn->privateData;
     char *opt = NULL;
 
@@ -507,6 +509,8 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid,
     }
 
     virFormatMacAddr(net->mac, macaddr);
+    virCapabilitiesGenerateMac(driver->caps, host_mac);
+    virFormatMacAddr(host_mac, host_macaddr);
 
     if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE) {
         virBuffer buf = VIR_BUFFER_INITIALIZER;
@@ -541,7 +545,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid,
         virBufferAdd(&buf, dev_name_ve, -1); /* Guest dev */
         virBufferVSprintf(&buf, ",%s", macaddr); /* Guest dev mac */
         virBufferVSprintf(&buf, ",%s", net->ifname); /* Host dev */
-        virBufferVSprintf(&buf, ",%s", macaddr); /* Host dev mac */
+        virBufferVSprintf(&buf, ",%s", host_macaddr); /* Host dev mac */
 
         if (driver->version >= VZCTL_BRIDGE_MIN_VERSION) {
             virBufferVSprintf(&buf, ",%s", net->data.bridge.brname); /* Host bridge */
@@ -549,7 +553,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid,
             virBufferVSprintf(configBuf, "ifname=%s", dev_name_ve);
             virBufferVSprintf(configBuf, ",mac=%s", macaddr); /* Guest dev mac */
             virBufferVSprintf(configBuf, ",host_ifname=%s", net->ifname); /* Host dev */
-            virBufferVSprintf(configBuf, ",host_mac=%s", macaddr); /* Host dev mac */
+            virBufferVSprintf(configBuf, ",host_mac=%s", host_macaddr); /* Host dev mac */
             virBufferVSprintf(configBuf, ",bridge=%s", net->data.bridge.brname); /* Host bridge */
         }