From 0c4048cbbc26425f205eecb5d70fe3bc247a8522 Mon Sep 17 00:00:00 2001 From: Marcus Sorensen Date: Wed, 17 Apr 2013 20:09:13 +0100 Subject: [PATCH] CLOUDSTACK-2067: Throw LibvirtException so that VM start failures are noticed, fix related NPE that can happen when VM starts fail Signed-off-by: Chip Childers --- .../kvm/resource/LibvirtComputingResource.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 373445e8b76..e6db9bfa086 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -985,8 +985,7 @@ ServerResource { */ dm = conn.domainCreateXML(domainXML, 0); } catch (final LibvirtException e) { - s_logger.warn("Failed to start domain " + vmName + ": " - + e.getMessage()); + throw e; } return null; @@ -4234,9 +4233,11 @@ ServerResource { } private void cleanupVMNetworks(Connect conn, List nics) { - for (InterfaceDef nic : nics) { - if (nic.getHostNetType() == hostNicType.VNET) { - cleanupVnet(conn, getVnetIdFromBrName(nic.getBrName())); + if (nics != null) { + for (InterfaceDef nic : nics) { + if (nic.getHostNetType() == hostNicType.VNET) { + cleanupVnet(conn, getVnetIdFromBrName(nic.getBrName())); + } } } }