diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py
index fdd117ab37399489603f7475a3134071d95254e8..2f97c8465e1979e117ce7aca24d6be9bbf0be49f 100644
--- a/lib/hypervisor/hv_kvm.py
+++ b/lib/hypervisor/hv_kvm.py
@@ -235,7 +235,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
     """
     if os.path.exists(uid_file):
       try:
-        uid = int(utils.ReadFile(uid_file))
+        uid = int(utils.ReadOneLineFile(uid_file))
         return uid
       except EnvironmentError:
         logging.warning("Can't read uid file", exc_info=True)
@@ -634,7 +634,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
     vnc_pwd = None
     if vnc_pwd_file:
       try:
-        vnc_pwd = utils.ReadFile(vnc_pwd_file)
+        vnc_pwd = utils.ReadOneLineFile(vnc_pwd_file, strict=True)
       except EnvironmentError, err:
         raise errors.HypervisorError("Failed to open VNC password file %s: %s"
                                      % (vnc_pwd_file, err))
diff --git a/lib/utils.py b/lib/utils.py
index 84167d28958d068855f598a6dcffdb34cafc1a18..bcf811a7b639a98c0ce53a04dc5facef6134f1fa 100644
--- a/lib/utils.py
+++ b/lib/utils.py
@@ -601,7 +601,7 @@ def ReadPidFile(pidfile):
 
   """
   try:
-    raw_data = ReadFile(pidfile)
+    raw_data = ReadOneLineFile(pidfile)
   except EnvironmentError, err:
     if err.errno != errno.ENOENT:
       logging.exception("Can't read pid file")