X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fvirt_mem_types.ml;h=ba50d00937bab5a6e1c63f978865f26ed299143b;hb=20ccce7fb55e81b6b8dd7d25512c4c1e215aea53;hp=c3da9328a144abb539d733d87c2e22b8dc8e5ee3;hpb=b8aef502747b039b20877f99f3d8986b6a9329d2;p=virt-mem.git

diff --git a/lib/virt_mem_types.ml b/lib/virt_mem_types.ml
index c3da932..ba50d00 100644
--- a/lib/virt_mem_types.ml
+++ b/lib/virt_mem_types.ml
@@ -29,31 +29,31 @@ type ksym = string
 
 module Ksymmap = Map.Make (String)
 
-type image0 = {
+type ksymmap = addr Ksymmap.t
+
+type utsname = {
+  uts_kernel_name : string;
+  uts_nodename : string;
+  uts_kernel_release : string;
+  uts_kernel_version : string;
+  uts_machine : string;
+  uts_domainname : string;
+}
+
+type kimage = {
   dom : Libvirt.ro D.t option;
   domname : string;
-  arch : Virt_mem_utils.architecture;
-  mem : ([`Wordsize], [`Endian], [`HasMapping]) Virt_mem_mmap.t;
+  arch : architecture;
   kernel_min : addr;
   kernel_max : addr;
-}
-
-type image1 =
-    image0
-    * addr Ksymmap.t
-
-type image2 =
-    image0
-    * addr Ksymmap.t
-    * utsname option
-
-and utsname = {
-  kernel_name : string;
-  nodename : string;
-  kernel_release : string;
-  kernel_version : string;
-  machine : string;
-  domainname : string;
+  mem : ([`Wordsize], [`Endian], [`HasMapping]) Virt_mem_mmap.t;
+  addrmap : Kernel.addrmap;
+  ksyms : ksymmap;
+  have_ksyms : bool;
+  have_kallsyms : bool;
+  utsname : utsname option;
+  have_tasks : bool;
+  have_net_devices : bool;
 }
 
 (* This is the maximum we can download in one go over the libvirt
@@ -81,7 +81,7 @@ let _load_memory mem dom start size =
   in
   loop 0;
 
-  add_string mem str start
+  Virt_mem_mmap.add_string mem str start
 
 let load_static_memory ~dom ~domname ~arch ~wordsize ~endian
     ~kernel_min ~kernel_max start size =
@@ -98,24 +98,28 @@ let load_static_memory ~dom ~domname ~arch ~wordsize ~endian
 
     let mem = _load_memory mem dom start size in
 
-    { dom = Some dom; domname = domname; mem = mem; arch = arch;
-      kernel_min = kernel_min; kernel_max = kernel_max }
+    { dom = Some dom; domname = domname; arch = arch;
+      kernel_min = kernel_min; kernel_max = kernel_max;
+      mem = mem; addrmap = Kernel.AddrMap.empty;
+      ksyms = Ksymmap.empty; have_ksyms = false; have_kallsyms = false;
+      utsname = None;
+      have_tasks = false; have_net_devices = false }
   )
 
 let load_memory ({ dom = dom; mem = mem; kernel_min = kernel_min;
-		   kernel_max = kernel_max } as image) start size =
+		   kernel_max = kernel_max } as kimage) start size =
   if start < kernel_min then
     raise (LoadMemoryError (AddressOutOfRange,
 			    "load_memory: start < kernel_min"))
   else if start +^ Int64.of_int size > kernel_max then
     raise (LoadMemoryError (AddressOutOfRange,
 			    "load_memory: start+size > kernel_max"))
-  else if is_mapped_range mem start size then image
+  else if Virt_mem_mmap.is_mapped_range mem start size then kimage
   else (
     match dom with
     | None ->
 	raise (LoadMemoryError (DomIsNull, "load_memory: dom = None"))
     | Some dom ->
 	let mem = _load_memory mem dom start size in
-	{ image with mem = mem }
+	{ kimage with mem = mem }
   )