VMware ESX: Allow ethernet address type 'vpx'

* src/esx/esx_vmx.c: add an extra type of addressType beside 'static'
  and 'generated', 'vpx' indicates that the MAC address was generated
  by a vCenter.

diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c
index 54c25947c740983008427df35bd6b6e1b5290fa4..70e9305d27b976c4ee973f9897749d531d0f4381 100644 (file)
--- a/src/esx/esx_vmx.c
+++ b/src/esx/esx_vmx.c
@@ -276,6 +276,10 @@ def->nets[0]...
                                         ethernet0.addressType = "static"        # default to "generated"
 ->mac = <value>                   <=>   ethernet0.address = "<value>"
 
+
+                                        ethernet0.addressType = "vpx"           # default to "generated"
+->mac = <value>                   <=>   ethernet0.generatedAddress = "<value>"
+
                                                                                 # 00:0c:29 prefix for autogenerated mac's
                                                                                 # 00:50:56 prefix for manual configured mac's
                                                                                 # 00:05:69 old prefix from esx 1.5
@@ -1369,7 +1373,8 @@ esxVMX_ParseEthernet(virConnectPtr conn, virConfPtr conf, int controller,
         goto failure;
     }
 
-    if (addressType == NULL || STRCASEEQ(addressType, "generated")) {
+    if (addressType == NULL || STRCASEEQ(addressType, "generated") ||
+        STRCASEEQ(addressType, "vpx")) {
         if (generatedAddress != NULL) {
             if (virParseMacAddr(generatedAddress, (*def)->mac) < 0) {
                 ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
@@ -1390,8 +1395,8 @@ esxVMX_ParseEthernet(virConnectPtr conn, virConfPtr conf, int controller,
         }
     } else {
         ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
-                  "Expecting VMX entry '%s' to be 'generated' or 'static' but "
-                  "found '%s'", addressType_name, addressType);
+                  "Expecting VMX entry '%s' to be 'generated' or 'static' or "
+                  "'vpx' but found '%s'", addressType_name, addressType);
         goto failure;
     }