Change to using internal format for kernel structures.

[virt-mem.git] / lib / virt_mem.ml

diff --git a/lib/virt_mem.ml b/lib/virt_mem.ml
index 7bd30dc..32da18e 100644 (file)
--- a/lib/virt_mem.ml
+++ b/lib/virt_mem.ml
@@ -514,12 +514,12 @@ Possibly the '-T' command line parameter was used inconsistently.");
   let needs_ksyms, needs_utsname =
     if needs_tasks then true, true
     else needs_ksyms, needs_utsname in
-  let needs_ksyms, needs_utsname, needs_tasks =
-    if needs_everything then true, true, true
-    else needs_ksyms, needs_utsname, needs_tasks in
-  let needs_ksyms, needs_utsname, needs_net_devices =
-    if needs_everything then true, true, true
-    else needs_ksyms, needs_utsname, needs_net_devices in
+  let needs_ksyms, needs_utsname =
+    if needs_net_devices then true, true
+    else needs_ksyms, needs_utsname in
+  let needs_ksyms, needs_utsname, needs_tasks, needs_net_devices =
+    if needs_everything then true, true, true, true
+    else needs_ksyms, needs_utsname, needs_tasks, needs_net_devices in
 
   (* Do the kernel symbol analysis. *)
   let images =
@@ -568,7 +568,7 @@ Possibly the '-T' command line parameter was used inconsistently.");
       List.map (
        fun (image, ({ ksyms = ksyms; utsname = utsname } as kdata)) ->
          match ksyms, utsname with
-         | Some ksyms, Some { kernel_release = kversion } ->
+         | Some ksyms, Some { uts_kernel_release = kversion } ->
              let image, tasks =
                Virt_mem_tasks.find_tasks debug image ksyms kversion in
              let kdata = { kdata with tasks = tasks } in
@@ -583,7 +583,7 @@ Possibly the '-T' command line parameter was used inconsistently.");
       List.map (
        fun (image, ({ ksyms = ksyms; utsname = utsname } as kdata)) ->
          match ksyms, utsname with
-         | Some ksyms, Some { kernel_release = kversion } ->
+         | Some ksyms, Some { uts_kernel_release = kversion } ->
              let image, net_devices =
                Virt_mem_net_devices.find_net_devices debug
                  image ksyms kversion in