diff --git a/lib/hypervisor/hv_xen.py b/lib/hypervisor/hv_xen.py index 5b71ff234b7ac8fdd441c4ffdf423ee4a0811be8..8007a5bd29c6f28c5522bda9f497c5db68b1b69b 100644 --- a/lib/hypervisor/hv_xen.py +++ b/lib/hypervisor/hv_xen.py @@ -587,14 +587,10 @@ class XenHvmHypervisor(XenHypervisor): config.write("vncunused = 1\n") try: - password_file = open(constants.VNC_PASSWORD_FILE, "r") - try: - password = password_file.readline() - finally: - password_file.close() - except IOError: - raise errors.OpExecError("failed to open VNC password file %s " % - constants.VNC_PASSWORD_FILE) + password = utils.ReadFile(constants.VNC_PASSWORD_FILE) + except EnvironmentError, err: + raise errors.HypervisorError("Failed to open VNC password file %s: %s" % + (constants.VNC_PASSWORD_FILE, err)) config.write("vncpasswd = '%s'\n" % password.rstrip())