diff --git a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
index f93fa65ae39..e6b4ad4ab9f 100755
--- a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
+++ b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
@@ -77,6 +77,7 @@ public class FirstFitAllocator implements HostAllocator {
     @Inject VMInstanceDao _vmInstanceDao = null;
     @Inject ResourceManager _resourceMgr;
     float _factor = 1;
+    boolean _checkHvm = true;
     protected String _allocationAlgorithm = "random";
     @Inject CapacityManager _capacityMgr;
     
@@ -331,6 +332,9 @@ public class FirstFitAllocator implements HostAllocator {
     }
     
     protected boolean hostSupportsHVM(HostVO host) {
+        if ( !_checkHvm ) {
+            return true;
+        }
     	// Determine host capabilities
 		String caps = host.getCapabilities();
 		
@@ -399,6 +403,8 @@ public class FirstFitAllocator implements HostAllocator {
             if (allocationAlgorithm != null) {
             	_allocationAlgorithm = allocationAlgorithm;
             }
+            String value = configs.get("xen.check.hvm");
+            _checkHvm = value == null ? true : Boolean.parseBoolean(value);
         }
         return true;
     }