X-Git-Url: http://git.annexia.org/?p=virt-mem.git;a=blobdiff_plain;f=lib%2Fvirt_mem_utsname.ml;h=084ba92a5820138d8b693cf961d8d87b3131857a;hp=61a2b374045259ee5a4fb9e17ffd52fc1692555e;hb=e7fad361d3dbf1689a22fdd1ae5f5579d6ef5fb0;hpb=693401d45aff92fc09c157eee41dcced4c600530

diff --git a/lib/virt_mem_utsname.ml b/lib/virt_mem_utsname.ml
index 61a2b37..084ba92 100644
--- a/lib/virt_mem_utsname.ml
+++ b/lib/virt_mem_utsname.ml
@@ -57,13 +57,13 @@ let parse_utsname bits =
   | { _ } ->
       None
 
-let find_utsname debug (domid, name, arch, mem, lookup_ksym) =
+let find_utsname debug ({ domname = name; mem = mem } as image, ksymmap) =
   let utsname =
     (* In Linux 2.6.25, the symbol is init_uts_ns.
      * http://lxr.linux.no/linux/init/version.c
      *)
     try
-      let addr = lookup_ksym "init_uts_ns" in
+      let addr = Ksymmap.find "init_uts_ns" ksymmap in
 
       let bs = Bitstring.bitstring_of_string (get_bytes mem addr (65*6+4)) in
       (bitmatch bs with
@@ -81,7 +81,7 @@ let find_utsname debug (domid, name, arch, mem, lookup_ksym) =
 	 * http://lxr.linux.no/linux-bk+v2.6.9/include/linux/utsname.h#L24
 	 *)
 	try
-	  let addr = lookup_ksym "system_utsname" in
+	  let addr = Ksymmap.find "system_utsname" ksymmap in
 
 	  let bits =
 	    Bitstring.bitstring_of_string (get_bytes mem addr (65*6)) in
@@ -90,4 +90,4 @@ let find_utsname debug (domid, name, arch, mem, lookup_ksym) =
 	      Not_found ->
 		eprintf (f_"%s: could not find utsname in kernel image\n") name
   in
-  (domid, name, arch, mem, lookup_ksym, utsname)
+  (image, ksymmap, utsname)