From: Dawid Zamirski <dzamirski@dattobackup.com>
Date: Mon, 9 Mar 2015 15:16:26 +0000 (-0400)
Subject: vmx: add e1000e to supported NIC models.
X-Git-Tag: v1.2.14-rc1~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1988a96e3af8cc54e7159101e327f311a32bf88f;p=thirdparty%2Flibvirt.git

vmx: add e1000e to supported NIC models.

This NIC model is supported on hardware version 8 and newer and libvirt
ESX driver does support those.
---

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index ac2542ad7b..fe6b8837b1 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -2536,10 +2536,11 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def)
         if (STRCASENEQ(virtualDev, "vlance") &&
             STRCASENEQ(virtualDev, "vmxnet") &&
             STRCASENEQ(virtualDev, "vmxnet3") &&
-            STRCASENEQ(virtualDev, "e1000")) {
+            STRCASENEQ(virtualDev, "e1000") &&
+            STRCASENEQ(virtualDev, "e1000e")) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("Expecting VMX entry '%s' to be 'vlance' or 'vmxnet' or "
-                             "'vmxnet3' or 'e1000' but found '%s'"), virtualDev_name,
+                             "'vmxnet3' or 'e1000e' or 'e1000e' but found '%s'"), virtualDev_name,
                            virtualDev);
             goto cleanup;
         }
@@ -3592,11 +3593,12 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int controller,
             STRCASENEQ(def->model, "vmxnet") &&
             STRCASENEQ(def->model, "vmxnet2") &&
             STRCASENEQ(def->model, "vmxnet3") &&
-            STRCASENEQ(def->model, "e1000")) {
+            STRCASENEQ(def->model, "e1000") &&
+            STRCASENEQ(def->model, "e1000e")) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("Expecting domain XML entry 'devices/interface/model' "
                              "to be 'vlance' or 'vmxnet' or 'vmxnet2' or 'vmxnet3' "
-                             "or 'e1000' but found '%s'"), def->model);
+                             "or 'e1000' or 'e1000e' but found '%s'"), def->model);
             return -1;
         }