X-Git-Url: http://git.annexia.org/?p=virt-mem.git;a=blobdiff_plain;f=lib%2Fvirt_mem_types.ml;h=071f6de1e07db93cfafb9c27702d3bad445aa0d7;hp=2f8b329b6708f5057c56ec818a80deb457a10140;hb=e7fad361d3dbf1689a22fdd1ae5f5579d6ef5fb0;hpb=89d41f7614612cf991d6005e7c1e20cd502a5404

diff --git a/lib/virt_mem_types.ml b/lib/virt_mem_types.ml
index 2f8b329..071f6de 100644
--- a/lib/virt_mem_types.ml
+++ b/lib/virt_mem_types.ml
@@ -20,20 +20,35 @@
    Common types.
  *)
 
-(** A kernel image. *)
-type image0 =
-    int option				(* Domain ID, if known. *)
-    * string				(* Domain name. *)
-    * Virt_mem_utils.architecture	(* Architecture, eg. i386. *)
-    * ([`Wordsize], [`Endian], [`HasMapping]) Virt_mem_mmap.t (* Memory map. *)
-
-(** A kernel symbol. *)
+module D = Libvirt.Domain
+
+open Virt_mem_mmap
+
 type ksym = string
 
-(** A kernel image, after finding kernel symbols. *)
+module Ksymmap = Map.Make (String)
+
+type image0 = {
+  dom : Libvirt.ro D.t option;
+  domname : string;
+  arch : Virt_mem_utils.architecture;
+  mem : ([`Wordsize], [`Endian], [`HasMapping]) Virt_mem_mmap.t;
+}
+
 type image1 =
-    int option				(* Domain ID, if known. *)
-    * string				(* Domain name. *)
-    * Virt_mem_utils.architecture	(* Architecture, eg. i386. *)
-    * ([`Wordsize], [`Endian], [`HasMapping]) Virt_mem_mmap.t (* Memory map. *)
-    * (ksym -> Virt_mem_mmap.addr)	(* Kernel symbol lookup function. *)
+    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;
+}