From d37c50a6d11425252c5fe6f22adf6d6969c2b680 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rubensm@dacya.ucm.es>
Date: Sat, 13 Nov 2010 01:12:11 +0100
Subject: [PATCH] bug #399: Changed ARCHITECURE for ARCH in VMware to make it
 coherent with KVM driver (cherry picked from commit
 4b006499ab577bcdf2638576953808ab656959e7)

---
 src/vmm/LibVirtDriverVMware.cc | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/vmm/LibVirtDriverVMware.cc b/src/vmm/LibVirtDriverVMware.cc
index 1429d73c46..84447fc4e1 100644
--- a/src/vmm/LibVirtDriverVMware.cc
+++ b/src/vmm/LibVirtDriverVMware.cc
@@ -132,26 +132,24 @@ int LibVirtDriver::deployment_description_vmware(
 
         if( os != 0 )
         {
-            arch = os->vector_value("ARCHITECTURE");
+            arch = os->vector_value("ARCH");
         }
     }
 
+    if ( arch.empty() )
+    {
+        get_default("OS","ARCH",arch);
+
+        if (arch.empty())
+        {
+            goto error_vmware_arch;
+        }
+    }
 
     // Start writing to the file with the info we got
 
     file << "\t<os>" << endl;
 
-
-    if ( arch.empty() )
-    {
-        get_default("OS","ARCHITECTURE",arch);
-    }
-
-    if (arch.empty())
-    {
-        goto error_vmware_arch;
-    }
-
     file << "\t\t<type arch='" << arch << "'>hvm</type>" << endl;
 
     file << "\t</os>" << endl;
@@ -245,7 +243,7 @@ int LibVirtDriver::deployment_description_vmware(
     }
 
     attrs.clear();
-    
+
     // ------------------------------------------------------------------------
     // Context Device
     // ------------------------------------------------------------------------
@@ -329,7 +327,7 @@ int LibVirtDriver::deployment_description_vmware(
     }
 
     attrs.clear();
-    
+
     file << "\t</devices>" << endl;
 
     // ------------------------------------------------------------------------
@@ -369,7 +367,7 @@ error_vmware_file:
     return -1;
 
 error_vmware_arch:
-    vm->log("VMM", Log::ERROR, "No ARCHITECTURE defined and no default provided.");
+    vm->log("VMM", Log::ERROR, "No ARCH defined and no default provided.");
     file.close();
     return -1;
 
@@ -383,4 +381,3 @@ error_vmware_disk:
     file.close();
     return -1;
 }
-