X-Git-Url: http://git.annexia.org/?p=virt-mem.git;a=blobdiff_plain;f=dmesg%2Fvirt_dmesg.ml;h=153d5e4460d48706169b0d8800fd72b0063f1e3a;hp=10d231f54cbe82fa4a4eea9635450aacc564188d;hb=cf4669f31197abcfb14dee874a4b738c9c2e6483;hpb=9860e1f7cc0f5e63d5e2bfb487ef4533d5b8516b

diff --git a/dmesg/virt_dmesg.ml b/dmesg/virt_dmesg.ml
index 10d231f..153d5e4 100644
--- a/dmesg/virt_dmesg.ml
+++ b/dmesg/virt_dmesg.ml
@@ -21,68 +21,62 @@ open Printf
 
 open Virt_mem_gettext.Gettext
 open Virt_mem_utils
+open Virt_mem_types
 open Virt_mem_mmap
 
-let usage = s_"NAME
-  virt-dmesg - dmesg command for virtual machines
-
-SUMMARY
-  virt-dmesg [-options] [domains]
-
-DESCRIPTION
-  virt-dmesg prints the kernel messages for virtual machines running
-  under libvirt.  The output is similar to the ordinary dmesg command
-  run inside the virtual machine."
-
-let verbose, images = Virt_mem.start usage
-
-let () =
-  List.iter (
-    fun (name, arch, mem, lookup_ksym) ->
-      try
-	(* I don't know why but this symbol doesn't exist in 2.6.9
-	 * even in kallsyms.  Hence this won't work with that kernel.
-	 * It's possible we can fall back to memory scanning. XXX
-	 *)
-	let log_buf = lookup_ksym "log_buf" in
-	let log_buf = follow_pointer mem log_buf in
-	let log_buf_len = lookup_ksym "log_buf_len" in
-	let log_buf_len = Int64.of_int32 (get_C_int mem log_buf_len) in
-(*	let log_start = lookup_ksym "log_start" in
+let run debug { domname = domname; mem = mem } { ksyms = ksyms } =
+  let ksyms = Option.get ksyms in
+  try
+    (* I don't know why but this symbol doesn't exist in 2.6.9
+     * even in kallsyms.  Hence this won't work with that kernel.
+     * It's possible we can fall back to memory scanning. XXX
+     *)
+    let log_buf = Ksymmap.find "log_buf" ksyms in
+    let log_buf = follow_pointer mem log_buf in
+    let log_buf_len = Ksymmap.find "log_buf_len" ksyms in
+    let log_buf_len = Int64.of_int32 (get_C_int mem log_buf_len) in
+    (*	let log_start = Ksymmap.find "log_start" ksyms in
 	let log_start = get_C_long mem log_start in *)
-	let log_end = lookup_ksym "log_end" in
-	let log_end = get_C_long mem log_end in
-(*	let con_start = lookup_ksym "con_start" in
+    let log_end = Ksymmap.find "log_end" ksyms in
+    let log_end = get_C_long mem log_end in
+    (*	let con_start = Ksymmap.find "con_start" ksyms in
 	let con_start = get_C_long mem con_start in *)
-	let logged_chars = lookup_ksym "logged_chars" in
-	let logged_chars = get_C_long mem logged_chars in
+    let logged_chars = Ksymmap.find "logged_chars" ksyms in
+    let logged_chars = get_C_long mem logged_chars in
+
+    (* This is basically the same algorithm from printk.c:do_syslog
+     * type=3, translated into OCaml.  Unlike the kernel version
+     * however we don't copy the buffer backwards.
+     *)
+    let get_log_buf idx =
+      let addr = log_buf +^ (idx &^ (log_buf_len -^ 1L)) in
+      Char.chr (get_byte mem addr)
+    in
+
+    let count = log_buf_len in
+    let count = if count > logged_chars then logged_chars else count in
+    let limit = log_end in
 
-	(* This is basically the same algorithm from printk.c:do_syslog
-	 * type=3, translated into OCaml.  Unlike the kernel version
-	 * however we don't copy the buffer backwards.
-	 *)
-	let get_log_buf idx =
-	  let addr = log_buf +^ (idx &^ (log_buf_len -^ 1L)) in
-	  Char.chr (get_byte mem addr)
-	in
+    let rec loop i =
+      if i >= 0L then (
+	let j = limit-^1L-^i in
+	if j +^ log_buf_len >= log_end then (
+	  let c = get_log_buf j in
+	  printf "%c" c;
+	  loop (i-^1L)
+	)
+      )
+    in
+    loop (count-^1L)
+  with
+    Not_found ->
+      eprintf (f_"%s: could not find kernel log buffer in kernel image\n")
+	domname
 
-	let count = log_buf_len in
-	let count = if count > logged_chars then logged_chars else count in
-	let limit = log_end in
+let summary = s_"display kernel messages"
+let description = s_"\
+virt-dmesg prints the kernel messages for virtual machines running
+under libvirt.  The output is similar to the ordinary dmesg command
+run inside the virtual machine."
 
-	let rec loop i =
-	  if i >= 0L then (
-	    let j = limit-^1L-^i in
-	    if j +^ log_buf_len >= log_end then (
-	      let c = get_log_buf j in
-	      printf "%c" c;
-	      loop (i-^1L)
-	    )
-	  )
-	in
-	loop (count-^1L)
-      with
-	Not_found ->
-	  eprintf (f_"%s: could not find kernel log buffer in kernel image\n")
-	    name
-  ) images
+let () = Virt_mem.register "dmesg" summary description ~needs_ksyms:true ~run