[PATCH for-4.9] oxenstored: remove "_proc" in names

[Wei Liu <wei.liu2@citrix.com>]

They aren't limited to proc file system anymore. Use more generic names.

No functional change.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
This is a follow-up patch for "oxenstored: make it work on FreeBSD".

Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: dave@recoil.org
Cc: christian.lindig@citrix.com
Cc: jonathan.ludlam@citrix.com
Cc: Roger Pau Monné <roger.pau@citrix.com>
---
 tools/ocaml/xenstored/define.ml  | 4 ++--
 tools/ocaml/xenstored/domains.ml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/ocaml/xenstored/define.ml b/tools/ocaml/xenstored/define.ml
index 15b03e539f..f3d8cd6ddc 100644
--- a/tools/ocaml/xenstored/define.ml
+++ b/tools/ocaml/xenstored/define.ml
@@ -19,13 +19,13 @@ open Unix_syscalls
 let xenstored_major = 1
 let xenstored_minor = 0
 
-let xenstored_proc_kva =
+let xenstored_kva =
   let info = Unix_syscalls.uname () in
   match info.sysname with
   | "Linux" -> "/proc/xen/xsd_kva"
   | "FreeBSD" -> "/dev/xen/xenstored"
   | _ -> "nonexistent"
-let xenstored_proc_port =
+let xenstored_port =
   let info = Unix_syscalls.uname () in
   match info.sysname with
   | "Linux" -> "/proc/xen/xsd_port"
diff --git a/tools/ocaml/xenstored/domains.ml b/tools/ocaml/xenstored/domains.ml
index fdae298613..572c9fb091 100644
--- a/tools/ocaml/xenstored/domains.ml
+++ b/tools/ocaml/xenstored/domains.ml
@@ -130,8 +130,8 @@ let create xc doms domid mfn port =
 let create0 doms =
 	let port, interface =
 		(
-			let port = Utils.read_file_single_integer Define.xenstored_proc_port
-			and fd = Unix.openfile Define.xenstored_proc_kva
+			let port = Utils.read_file_single_integer Define.xenstored_port
+			and fd = Unix.openfile Define.xenstored_kva
 					       [ Unix.O_RDWR ] 0o600 in
 			let interface = Xenmmap.mmap fd Xenmmap.RDWR Xenmmap.SHARED
 						  (Xenmmap.getpagesize()) 0 in
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel