[libvirt] [PATCH] vmx: add e1000e to supported NIC models.

[Michal Privoznik]

On 09.03.2015 16:16, Dawid Zamirski wrote:
> From: Dawid Zamirski <dzamirski at dattobackup.com>
> 
> This NIC model is supported on hardware version 8 and newer and libvirt
> ESX driver does support those.
> ---
>  src/vmx/vmx.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
> index ac2542a..fe6b883 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;
>          }
>  
> 

ACKed and pushed.

I've noticed increasing number of e-mails form datto.com domain. If
you're developing an mgmt application which is open-source, do you mind
proposing a patch for docs/apps.html.in too? It's the source for the
following page:

  http://libvirt.org/apps.html

Michal