From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Fri, 13 Nov 2009 21:55:25 +0000 (+0100)
Subject: esx: Handle 'vmxnet3' in esxVMX_FormatEthernet()
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4b3e19526c72ea4a692d1ab9a904fa2c9ba8a7fc;p=libvirt.git

esx: Handle 'vmxnet3' in esxVMX_FormatEthernet()

In commit 3c80fac2588cbc9e5ee7e7069e1ca4468f2359d3 'vmxnet3' handling
was added to esxVMX_ParseEthernet(), but not to the inverse function
esxVMX_FormatEthernet().
---

diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c
index 536bf2da83..97ad43ebfc 100644
--- a/src/esx/esx_vmx.c
+++ b/src/esx/esx_vmx.c
@@ -1758,7 +1758,8 @@ esxVMX_ParseEthernet(virConnectPtr conn, virConfPtr conf, int controller,
         STRCASENEQ(virtualDev, "e1000")) {
         ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
                   "Expecting VMX entry '%s' to be 'vlance' or 'vmxnet' or "
-                  "'vmxnet3' or 'e1000' but found '%s'", virtualDev_name, virtualDev);
+                  "'vmxnet3' or 'e1000' but found '%s'", virtualDev_name,
+                  virtualDev);
         goto failure;
     }
 
@@ -2646,11 +2647,12 @@ esxVMX_FormatEthernet(virConnectPtr conn, virDomainNetDefPtr def,
     if (def->model != NULL) {
         if (STRCASENEQ(def->model, "vlance") &&
             STRCASENEQ(def->model, "vmxnet") &&
+            STRCASENEQ(def->model, "vmxnet3") &&
             STRCASENEQ(def->model, "e1000")) {
             ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
                       "Expecting domain XML entry 'devices/interfase/model' "
-                      "to be 'vlance' or 'vmxnet' or 'e1000' but found '%s'",
-                      def->model);
+                      "to be 'vlance' or 'vmxnet' or 'vmxnet3' or 'e1000' but "
+                      "found '%s'", def->model);
             return -1;
         }