X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=uname%2Fvirt_uname.ml;h=d90974d2d8b950e85c01645414b617656b8b0849;hb=cf4669f31197abcfb14dee874a4b738c9c2e6483;hp=6004bb860201c2b5c381e54fe09ee7a91b8d739a;hpb=8eb1c2c4f71819108ceea4731f4dad75775ce6ae;p=virt-mem.git

diff --git a/uname/virt_uname.ml b/uname/virt_uname.ml
index 6004bb8..d90974d 100644
--- a/uname/virt_uname.ml
+++ b/uname/virt_uname.ml
@@ -21,72 +21,17 @@ open Printf
 
 open Virt_mem_gettext.Gettext
 open Virt_mem_utils
-open Virt_mem_mmap
-
-let run debug images =
-  (* Print new_utsname structure from bitstring. *)
-  let print_new_utsname name bs =
-    (* Truncate an OCaml string at the first ASCII NUL character, ie. as
-     * if it were a C string.
-     *)
-    let truncate str =
-      try
-	let i = String.index str '\000' in
-	String.sub str 0 i
-      with
-	Not_found -> str
-    in
-    (* Expect the first (sysname) field to always be "Linux", which is
-     * also a good way to tell if we're synchronized to the right bit of
-     * memory.
-     *)
-    bitmatch bs with
-    | { "Linux\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" : 65*8 : string;
-	nodename : 65*8 : string;
-	release : 65*8 : string;
-	version : 65*8 : string;
-	machine : 65*8 : string;
-	domainname : 65*8 : string } ->
-	printf "%s: Linux %s %s %s %s %s\n"
-	  name
-	  (truncate nodename) (truncate release)
-	  (truncate version) (truncate machine) (truncate domainname)
-    | { _ } ->
-	eprintf (f_"%s: unexpected system_utsname in kernel image\n")
-	  name
-  in
-
-  List.iter (
-    fun (_, name, arch, mem, lookup_ksym) ->
-      (* 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 bs = Bitstring.bitstring_of_string (get_bytes mem addr (65*6+4)) in
-	(bitmatch bs with
-	 | { _ : 32 : int;		(* the kref, atomic_t, always 32 bits *)
-	     new_utsname : -1 : bitstring } ->
-	     print_new_utsname name new_utsname
-	 | { _ } ->
-	     eprintf (f_"%s: unexpected init_uts_ns in kernel image\n")
-	       name)
-      with
-	Not_found ->
-	  (* In Linux 2.6.9, the symbol is system_utsname.
-	   * http://lxr.linux.no/linux-bk+v2.6.9/include/linux/utsname.h#L24
-	   *)
-	  try
-	    let addr = lookup_ksym "system_utsname" in
-
-	    let bs =
-	      Bitstring.bitstring_of_string (get_bytes mem addr (65*6)) in
-	    print_new_utsname name bs
-	  with
-	    Not_found ->
-	      eprintf (f_"%s: could not find utsname in kernel image\n") name
-  ) images
+open Virt_mem_types
+
+let run debug { domname = domname } { utsname = utsname } =
+  match utsname with
+  | Some u ->
+      printf "%s: %s %s %s %s %s %s\n"
+	domname
+	u.kernel_name u.nodename u.kernel_release
+	u.kernel_version u.machine u.domainname
+  | None ->
+      eprintf (f_"%s: no system_utsname in kernel image\n") domname
 
 let summary = s_"uname command for virtual machines"
 let description = s_"\
@@ -94,4 +39,4 @@ virt-uname prints the uname information such as OS version,
 architecture and node name for virtual machines running under
 libvirt."
 
-let () = Virt_mem.register "uname" summary description ~run
+let () = Virt_mem.register "uname" summary description ~needs_utsname:true ~run