diff options
| author |   Matthias Bolte <matthias.bolte@googlemail.com> | 2009-11-13 22:55:25 +0100 |
|---|---|---|
| committer | Matthias Bolte <matthias.bolte@googlemail.com> | 2009-11-15 15:21:48 +0100 |
| commit | 4b3e19526c72ea4a692d1ab9a904fa2c9ba8a7fc (patch) | |
| tree | 89cac76cbdb77e91626466b4c6418ec08281282c | |
| parent | esx: Add documentation to the website (diff) | |
| download | libvirt-4b3e19526c72ea4a692d1ab9a904fa2c9ba8a7fc.tar.gz libvirt-4b3e19526c72ea4a692d1ab9a904fa2c9ba8a7fc.tar.bz2 libvirt-4b3e19526c72ea4a692d1ab9a904fa2c9ba8a7fc.zip | |
esx: Handle 'vmxnet3' in esxVMX_FormatEthernet()
In commit 3c80fac2588cbc9e5ee7e7069e1ca4468f2359d3 'vmxnet3' handling
was added to esxVMX_ParseEthernet(), but not to the inverse function
esxVMX_FormatEthernet().
| -rw-r--r-- | 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 536bf2da8..97ad43ebf 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; } |