diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-04 09:34:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-04 09:34:04 +0000 |
| commit | ed6099d77ed1ee4a2c8c8b135d6ac18f70d48625 (patch) | |
| tree | 6883b753251054e9f3a43292bb951acdf4628236 | |
| parent | 150051daef7b55f45359407804d571b02e440915 (diff) | |
| parent | eb40b5ab13d11e773eb0c78084e9935fcd5a6552 (diff) | |
| download | nova-ed6099d77ed1ee4a2c8c8b135d6ac18f70d48625.tar.gz nova-ed6099d77ed1ee4a2c8c8b135d6ac18f70d48625.tar.xz nova-ed6099d77ed1ee4a2c8c8b135d6ac18f70d48625.zip | |
Merge "Stop libvirt errors from outputting to strerr"
| -rw-r--r-- | nova/tests/virt/libvirt/fakelibvirt.py | 4 | ||||
| -rwxr-xr-x | nova/virt/libvirt/driver.py | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/nova/tests/virt/libvirt/fakelibvirt.py b/nova/tests/virt/libvirt/fakelibvirt.py index 30c3e4d9c..9594757a8 100644 --- a/nova/tests/virt/libvirt/fakelibvirt.py +++ b/nova/tests/virt/libvirt/fakelibvirt.py @@ -914,6 +914,10 @@ def virEventRegisterDefaultImpl(): pass +def registerErrorHandler(handler, ctxt): + pass + + virDomain = Domain diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index becc132de..19613acd4 100755 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -289,6 +289,11 @@ MIN_LIBVIRT_LIVESNAPSHOT_VERSION = (1, 0, 0) MIN_QEMU_LIVESNAPSHOT_VERSION = (1, 3, 0) +def libvirt_error_handler(ctxt, err): + # Just ignore instead of default outputting to stderr. + pass + + class LibvirtDriver(driver.ComputeDriver): capabilities = { @@ -543,6 +548,7 @@ 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): |