summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Short <zulcss@ubuntu.com>2011-03-25 08:37:47 -0400
committerChuck Short <zulcss@ubuntu.com>2011-03-25 08:37:47 -0400
commit47b54662c17c7af0bca9cf96dc5d4a498706fe8b (patch)
tree2e783ab3020cf0cf6506dea78e827bcdfe6bfec7
parent9632db75d229eac16970af1dfabbb047c2b71a4e (diff)
downloadnova-47b54662c17c7af0bca9cf96dc5d4a498706fe8b.tar.gz
nova-47b54662c17c7af0bca9cf96dc5d4a498706fe8b.tar.xz
nova-47b54662c17c7af0bca9cf96dc5d4a498706fe8b.zip
Dont always assume qemu
-rw-r--r--nova/virt/libvirt_conn.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index bfb0a75f1..840eaceeb 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -1053,7 +1053,8 @@ class LibvirtConnection(driver.ComputeDriver):
total = 0
for dom_id in self._conn.listDomainsID():
dom = self._conn.lookupByID(dom_id)
- total += len(dom.vcpus()[1])
+ if dom is None:
+ total += len(dom.vcpus()[1])
return total
def get_memory_mb_used(self):