cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sate...@apache.org
Subject git commit: updated refs/heads/master to 14abe4c
Date Mon, 12 Aug 2013 07:43:33 GMT
Updated Branches:
  refs/heads/master 59f944d7c -> 14abe4cb2


CLOUDSTACK-4155 [VMWARE] Failed to deploy VM with NPE when vmware.nested.virtualization is
enabled to true

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/14abe4cb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/14abe4cb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/14abe4cb

Branch: refs/heads/master
Commit: 14abe4cb2dbdc9293926ec706b01ab068d03c34d
Parents: 59f944d
Author: Sateesh Chodapuneedi <sateesh@apache.org>
Authored: Mon Aug 12 07:43:10 2013 +0530
Committer: Sateesh Chodapuneedi <sateesh@apache.org>
Committed: Mon Aug 12 07:43:10 2013 +0530

----------------------------------------------------------------------
 .../src/com/cloud/hypervisor/vmware/resource/VmwareResource.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14abe4cb/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index d3b136a..c61e171 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2679,7 +2679,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource,
Vmwa
                 ManagedObjectReference environmentBrowser =
                         context.getVimClient().getMoRefProp(computeMor, "environmentBrowser");
                 HostCapability hostCapability = context.getService().queryTargetCapabilities(environmentBrowser,
hostMor);
-                if (hostCapability.isNestedHVSupported()) {
+                Boolean nestedHvSupported = hostCapability.isNestedHVSupported();
+                if (nestedHvSupported != null && nestedHvSupported.booleanValue())
{
                     s_logger.debug("Hypervisor supports nested virtualization, enabling for
VM " + vmSpec.getName());
                     vmConfigSpec.setNestedHVEnabled(true);
                 }


Mime
View raw message