diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-09 02:53:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-09 02:53:44 +0000 |
| commit | e83a155f4cc92cbf9fae8b1587d14e8a8158f245 (patch) | |
| tree | a6c5d6fa0da92396c9d592b814f84df23631a8f2 | |
| parent | ab9ee3d232e0000dd8b8f1d2623d8ac72a6c9247 (diff) | |
| parent | 0406d1f85fa93db4e4d5ab8b37d298951d4c4193 (diff) | |
Merge "make diagnostics workable for libvirt with Xen"
| -rw-r--r-- | nova/virt/libvirt/driver.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index c59876d95..7f962b45d 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -2986,7 +2986,7 @@ class LibvirtDriver(driver.ComputeDriver): mem = domain.memoryStats() for key in mem.keys(): output["memory-" + key] = mem[key] - except libvirt.libvirtError: + except (libvirt.libvirtError, AttributeError): pass return output |