Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4B5FD105CC for ; Mon, 12 Aug 2013 07:43:35 +0000 (UTC) Received: (qmail 59933 invoked by uid 500); 12 Aug 2013 07:43:35 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 59904 invoked by uid 500); 12 Aug 2013 07:43:34 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 59894 invoked by uid 99); 12 Aug 2013 07:43:33 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Aug 2013 07:43:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7FAED8BC316; Mon, 12 Aug 2013 07:43:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sateesh@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 14abe4c Date: Mon, 12 Aug 2013 07:43:33 +0000 (UTC) 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 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 Authored: Mon Aug 12 07:43:10 2013 +0530 Committer: Sateesh Chodapuneedi 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); }