On Sat, Nov 14, 2009 at 01:11:02AM +0100, Matthias Bolte wrote:
> In commit 3c80fac2588cbc9e5ee7e7069e1ca4468f2359d3 'vmxnet3' handling
> was added to esxVMX_ParseEthernet(), but not to the inverse function
> esxVMX_FormatEthernet().
> ---
> src/esx/esx_vmx.c | 8 +++++---
> 1 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c
> index 536bf2d..97ad43e 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;
> }
>
Okay, that's really a bug fix, ACK !
Daniel
--
Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
daniel@xxxxxxxxxxxx | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library http://libvirt.org/
--
Libvir-list mailing list
Libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list