diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-19 09:49:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-19 09:49:54 +0000 |
| commit | 6808e052dbe9bc51b5836814d0a0331dcc5a6bd2 (patch) | |
| tree | 223d97b319b7553162ace0631662193c647a6d2f | |
| parent | 2bcd6b59a6d6848144ff9fb4f7b4c2241b907515 (diff) | |
| parent | db0ac5ff995143992e306fe5246a2375473c8030 (diff) | |
| download | nova-6808e052dbe9bc51b5836814d0a0331dcc5a6bd2.tar.gz nova-6808e052dbe9bc51b5836814d0a0331dcc5a6bd2.tar.xz nova-6808e052dbe9bc51b5836814d0a0331dcc5a6bd2.zip | |
Merge "Check libvirt version earlier"
| -rwxr-xr-x | nova/virt/libvirt/driver.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 6cfa2c7c7..6f1da242a 100755 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -557,9 +557,6 @@ class LibvirtDriver(driver.ComputeDriver): dispatch_thread = eventlet.spawn(self._dispatch_thread) def init_host(self, host): - libvirt.registerErrorHandler(libvirt_error_handler, None) - libvirt.virEventRegisterDefaultImpl() - if not self.has_min_version(MIN_LIBVIRT_VERSION): major = MIN_LIBVIRT_VERSION[0] minor = MIN_LIBVIRT_VERSION[1] @@ -568,6 +565,9 @@ class LibvirtDriver(driver.ComputeDriver): '%(major)i.%(minor)i.%(micro)i or greater.') % locals()) + libvirt.registerErrorHandler(libvirt_error_handler, None) + libvirt.virEventRegisterDefaultImpl() + self._init_events() def _get_connection(self): |