From: Heath Petersen <HeathPetersen@Kandre.com>
Date: Thu, 2 Jun 2011 16:23:43 +0000 (-0500)
Subject: uml: correct command line networking parameters
X-Git-Tag: v0.9.2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39b59dbdb4cf81302adee76d88c76f59b1281708;p=thirdparty%2Flibvirt.git

uml: correct command line networking parameters

I have been finding that some UML command line networking parameters are
being generated incorrectly.

For more information, see
https://bugzilla.redhat.com/show_bug.cgi?id=706295 .
---

diff --git a/AUTHORS b/AUTHORS
index 6e0276e34c..0cc09ce68e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -172,6 +172,7 @@ Patches have also been contributed by:
   Supriya Kannery      <supriyak@in.ibm.com>
   Dirk Herrendoerfer   <d.herrendoerfer@herrendoerfer.name>
   Taisuke Yamada       <tai@rakugaki.org>
+  Heath Petersen       <HeathPetersen@Kandre.com>
 
   [....send patches to get your name here....]
 
diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 4f1cb243d6..0122472c71 100644
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -207,7 +207,10 @@ umlBuildCommandLineNet(virConnectPtr conn,
 
     case VIR_DOMAIN_NET_TYPE_ETHERNET:
         /* ethNNN=tuntap,tapname,macaddr,gateway */
-        virBufferAddLit(&buf, "tuntap");
+        virBufferAddLit(&buf, "tuntap,");
+        if (def->ifname) {
+            virBufferAdd(&buf, def->ifname, -1);
+        }
         if (def->data.ethernet.ipaddr) {
             umlReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                            _("IP address not supported for ethernet inteface"));