From: Alvaro Polo <apoloval@gmail.com>
Date: Thu, 6 Jun 2013 07:53:54 +0000 (+0200)
Subject: openvz: Fix code coverage issue in OpenVZ driver
X-Git-Tag: v1.1.0-rc1~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d39a491ff5a322112d26e733194b2333dbac68d;p=thirdparty%2Flibvirt.git

openvz: Fix code coverage issue in OpenVZ driver

After fixing an invalid usage of virDomainNetDef in OpenVZ driver,
a coverage issue appeared. This was caused by a still invalid usage
of net->data.ethernet.dev for non ethernet networking.
---

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index db738a455a..d8abe9c5b3 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -859,7 +859,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid,
         /* if user doesn't specified host interface name,
          * than we need to generate it */
         if (net->ifname == NULL) {
-            net->ifname = openvzGenerateVethName(veid, net->data.ethernet.dev);
+            net->ifname = openvzGenerateVethName(veid, guest_ifname);
             if (net->ifname == NULL) {
                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                               _("Could not generate veth name"));