X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fvirt_mem.ml;h=69a08215daaff6e01d4618733819b619cfad656c;hb=b8aef502747b039b20877f99f3d8986b6a9329d2;hp=03b0d1e5cc2314d528132c0e3d85cf61746cbdaa;hpb=643e58b5e26c18f2cfc1c7b9aa676cb44feee847;p=virt-mem.git

diff --git a/lib/virt_mem.ml b/lib/virt_mem.ml
index 03b0d1e..69a0821 100644
--- a/lib/virt_mem.ml
+++ b/lib/virt_mem.ml
@@ -35,7 +35,6 @@ open Virt_mem_types
 let kernel_size =
   if Sys.word_size = 32 then Sys.max_string_length
   else 0x100_0000
-let max_memory_peek = 65536 (* XXX Use D.max_peek function *)
 
 (* When tools register themselves, they are added to this list.
  * Later, we will alphabetize the list.
@@ -152,7 +151,7 @@ Options:") cmd summary description in
   let uri = ref "" in
   let anon_args = ref [] in
 
-  (* Default wordsize. *)
+  (* Default wordsize (-W). *)
   let def_wordsize = ref None in
   let set_wordsize = function
     | "32" -> def_wordsize := Some W32
@@ -161,7 +160,7 @@ Options:") cmd summary description in
     | str -> failwith (sprintf (f_"set_wordsize: %s: unknown wordsize") str)
   in
 
-  (* Default endianness. *)
+  (* Default endianness (-E). *)
   let def_endian = ref None in
   let set_endian = function
     | "auto" -> def_endian := None
@@ -172,7 +171,7 @@ Options:") cmd summary description in
     | str -> failwith (sprintf (f_"set_endian: %s: unknown endianness") str)
   in
 
-  (* Default architecture. *)
+  (* Default architecture (-A). *)
   let def_architecture = ref None in
   let set_architecture = function
     | "auto" -> def_architecture := None
@@ -183,19 +182,43 @@ Options:") cmd summary description in
 	def_wordsize := Some (wordsize_of_architecture arch)
   in
 
-  (* Default text address. *)
+  (* Default text address (-T). *)
   let def_text_addr = ref 0L (* 0 = auto-detect *) in
+  let def_kernel_min = ref 0L in
+  let def_kernel_max = ref 0L in
   let set_text_addr = function
     | "auto" -> def_text_addr := 0L
-    | "i386" -> def_text_addr := 0xc010_0000_L (* common for x86 *)
-    | "x86-64"|"x86_64" -> def_text_addr := 0xffffffff_81000000_L (* x86-64? *)
-    | str -> def_text_addr := Int64.of_string str
+    | "i386" ->
+	(* common for x86, but we should be able to try a selection *)
+	def_text_addr :=  0xc010_0000_L;
+	def_kernel_min := 0xc010_0000_L;
+	def_kernel_max := 0xffff_ffff_L
+    | "x86-64"|"x86_64" ->
+	def_text_addr  := 0xffffffff_81000000_L;
+	def_kernel_min := 0xffffffff_81000000_L;
+	def_kernel_max := 0xffffffff_ffffffff_L;
+    | str ->
+	let strs = String.nsplit str "," in
+	match strs with
+	| [str] ->
+	    def_text_addr := Int64.of_string str;
+	    def_kernel_min := !def_text_addr;
+	    def_kernel_max :=
+	      if !def_text_addr < 0x1_0000_0000_L
+	      then 0xffff_ffff_L
+	      else 0xffffffff_ffffffff_L
+	| [str1;str2;str3] ->
+	    def_text_addr := Int64.of_string str1;
+	    def_kernel_min := Int64.of_string str2;
+	    def_kernel_max := Int64.of_string str3
+	| _ -> failwith (sprintf (f_"set_text_addr: %s: incorrect number of parameters to -T option") str)
   in
 
   (* Handle -t option. *)
   let memory_image filename =
     testimages :=
-      (!def_wordsize, !def_endian, !def_architecture, !def_text_addr, filename)
+      (!def_wordsize, !def_endian, !def_architecture,
+       !def_text_addr, !def_kernel_min, !def_kernel_max, filename)
     :: !testimages
   in
 
@@ -350,22 +373,21 @@ Use 'virt-mem --help' for more help or read the manual page virt-mem(1)");
 
       List.map (
 	fun (dom, _) ->
-	  let id = D.get_id dom in
-	  let name = D.get_name dom in
+	  let domname = D.get_name dom in
 
 	  let wordsize =
 	    match !def_wordsize with
 	    | None ->
 		failwith
 		  (sprintf (f_"%s: use -W to define word size for this image")
-		     name);
+		     domname);
 	    | Some ws -> ws in
 	  let endian =
 	    match !def_endian with
 	    | None ->
 		failwith
 		  (sprintf (f_"%s: use -E to define endianness for this image")
-		     name);
+		     domname);
 	    | Some e -> e in
 
 	  let arch =
@@ -373,28 +395,29 @@ Use 'virt-mem --help' for more help or read the manual page virt-mem(1)");
 	    | Some I386 -> I386 | Some X86_64 -> X86_64
 	    | _ ->
 		failwith
-		  (sprintf (f_"%s: use -A to define architecture (i386/x86-64 only) for this image") name) in
+		  (sprintf (f_"%s: use -A to define architecture (i386/x86-64 only) for this image") domname) in
 
-	  if !def_text_addr = 0L then
-	    failwith
-	      (sprintf (f_"%s: use -T to define kernel load address for this image") name);
+	  if !def_text_addr = 0L ||
+	    !def_kernel_min = 0L ||
+	    !def_kernel_max = 0L then
+	      failwith
+		(sprintf (f_"%s: use -T to define kernel load address for this image") domname);
 
+	  (* Download the static part of the kernel. *)
 	  let start_t = gettimeofday () in
 
-	  (* Read the kernel memory.
-	   * Maximum 64K can be read over remote connections.
-	   *)
-	  let str = String.create kernel_size in
-	  let rec loop i =
-	    let remaining = kernel_size - i in
-	    if remaining > 0 then (
-	      let size = min remaining max_memory_peek in
-	      D.memory_peek dom [D.Virtual]
-		(!def_text_addr +^ Int64.of_int i) size str i;
-	      loop (i + size)
-	    )
-	  in
-	  loop 0;
+	  let image =
+	    try
+	      load_static_memory ~dom ~domname ~arch
+		~wordsize ~endian
+		~kernel_min:!def_kernel_min ~kernel_max:!def_kernel_max
+		!def_text_addr kernel_size
+	    with
+	    | LoadMemoryError (AddressOutOfRange, _) ->
+		prerr_endline (s_"virt-mem: error loading kernel memory: address out of range
+Possibly the '-T' command line parameter was used inconsistently.");
+		exit 1
+	    (* Allow any other exceptions to escape & kill the program. *) in
 
 	  if debug then (
 	    let end_t = gettimeofday () in
@@ -402,14 +425,8 @@ Use 'virt-mem --help' for more help or read the manual page virt-mem(1)");
 	      (end_t -. start_t)
 	  );
 
-	  (* Map the virtual memory. *)
-	  let mem = Virt_mem_mmap.of_string str !def_text_addr in
-
-	  (* Force the wordsize and endianness. *)
-	  let mem = Virt_mem_mmap.set_wordsize mem wordsize in
-	  let mem = Virt_mem_mmap.set_endian mem endian in
+	  image
 
-	  ((Some id, name, arch, mem) : image0)
       ) xmls
     ) else (
       (* One or more -t options passed. *)
@@ -417,7 +434,8 @@ Use 'virt-mem --help' for more help or read the manual page virt-mem(1)");
 	failwith (s_"virt-mem: if -t given on command line, then no domain arguments should be listed");
 
       List.map (
-	fun (wordsize, endian, arch, text_addr, filename) ->
+	fun (wordsize, endian, arch,
+	     text_addr, kernel_min, kernel_max, filename) ->
 	  (* Quite a lot of limitations on the kernel images we can
 	   * handle at the moment ...
 	   *)
@@ -457,7 +475,8 @@ Use 'virt-mem --help' for more help or read the manual page virt-mem(1)");
 	  let mem = Virt_mem_mmap.set_wordsize mem wordsize in
 	  let mem = Virt_mem_mmap.set_endian mem endian in
 
-	  ((None, filename, arch, mem) : image0)
+	  { dom = None; domname = filename; mem = mem; arch = arch;
+	    kernel_min = kernel_min; kernel_max = kernel_max }
       ) testimages
     ) in
 
@@ -483,6 +502,7 @@ Use 'virt-mem --help' for more help or read the manual page virt-mem(1)");
 	(* Look for kallsyms: *)
 	let image = Virt_mem_kallsyms.find_kallsyms debug image in
 
+(*
 	(* Finally, just wrap the lookup_ksym call in something
 	 * which prints the query when debug is set.
 	 *)
@@ -501,6 +521,7 @@ Use 'virt-mem --help' for more help or read the manual page virt-mem(1)");
 	    (domid, name, arch, mem, lookup_ksym)
 	  else
 	    image in
+*)
 
 	image
     ) images in