diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py index e2a13eef9ea78840de9c34d418125916114a0eaf..ba5b39d2d3d25eb0f79d79dcd921dca25ce5d45f 100644 --- a/lib/hypervisor/hv_kvm.py +++ b/lib/hypervisor/hv_kvm.py @@ -167,7 +167,7 @@ class KVMHypervisor(hv_base.BaseHypervisor): cmdline = fh.read() finally: fh.close() - except IOError, err: + except EnvironmentError, err: raise errors.HypervisorError("Failed to list instance %s: %s" % (instance_name, err)) @@ -266,7 +266,7 @@ class KVMHypervisor(hv_base.BaseHypervisor): try: utils.WriteFile(self._InstanceKVMRuntime(instance_name), data=data) - except IOError, err: + except EnvironmentError, err: raise errors.HypervisorError("Failed to save KVM runtime file: %s" % err) def _ReadKVMRuntime(self, instance_name): @@ -275,7 +275,7 @@ class KVMHypervisor(hv_base.BaseHypervisor): """ try: file_content = utils.ReadFile(self._InstanceKVMRuntime(instance_name)) - except IOError, err: + except EnvironmentError, err: raise errors.HypervisorError("Failed to load KVM runtime file: %s" % err) return file_content @@ -535,7 +535,7 @@ class KVMHypervisor(hv_base.BaseHypervisor): data = fh.readlines() finally: fh.close() - except IOError, err: + except EnvironmentError, err: raise errors.HypervisorError("Failed to list node info: %s" % err) result = {}