From 05c7a8d1d9886935ec56d80171eb01217e83801a Mon Sep 17 00:00:00 2001
From: Pierre Alain <pierre.alain@tuta.io>
Date: Tue, 23 Apr 2024 18:09:53 +0200
Subject: [PATCH] address @hannesm comments

---
 config.ml          | 14 +++++++-------
 memory_pressure.ml | 17 -----------------
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/config.ml b/config.ml
index c092574..89bb9bd 100644
--- a/config.ml
+++ b/config.ml
@@ -1,4 +1,4 @@
-(* mirage >= 4.5.0 *)
+(* mirage >= 4.5.0 & < 5.0.0 *)
 (* Copyright (C) 2017, Thomas Leonard <thomas.leonard@unikernel.com>
    See the README file for details. *)
 
@@ -14,23 +14,23 @@ let ipv4_dns2 = runtime_arg ~pos:__POS__ "Unikernel.ipv4_dns2"
 
 let main =
    main
-    ~runtime_args:[ nat_table_size; ]
+    ~runtime_args:[ nat_table_size; ipv4; ipv4_gw; ipv4_dns; ipv4_dns2; ]
     ~packages:[
       package "vchan" ~min:"4.0.2";
       package "cstruct";
       package "astring";
       package "tcpip" ~min:"3.7.0";
-      package "arp" ~min:"2.3.0" ~sublibs:["mirage"];
-      package "ethernet" ~min:"3.0.0";
+      package ~min:"2.3.0" ~sublibs:["mirage"] "arp";
+      package ~min:"3.0.0" "ethernet";
       package "shared-memory-ring" ~min:"3.0.0";
-      package "netchannel" ~min:"2.1.3";
+      package ~min:"2.1.3" "netchannel";
       package "mirage-net-xen" ~min:"2.1.3";
       package "ipaddr" ~min:"5.2.0";
       package "mirage-qubes" ~min:"0.9.1";
-      package "mirage-nat" ~min:"3.0.1";
+      package ~min:"3.0.1" "mirage-nat";
       package "mirage-logs";
       package "mirage-xen" ~min:"8.0.0";
-      package "dns-client" ~min:"6.4.0";
+      package ~min:"6.4.0" "dns-client";
       package "pf-qubes";
     ]
     "Unikernel.Main" (random @-> mclock @-> time @-> job)
diff --git a/memory_pressure.ml b/memory_pressure.ml
index 87289c2..bfa5c8d 100644
--- a/memory_pressure.ml
+++ b/memory_pressure.ml
@@ -1,8 +1,6 @@
 (* Copyright (C) 2015, Thomas Leonard <thomas.leonard@unikernel.com>
    See the README file for details. *)
 
-open Lwt
-
 let src = Logs.Src.create "memory_pressure" ~doc:"Memory pressure monitor"
 module Log = (val Logs.src_log src : Logs.LOG)
 
@@ -12,21 +10,6 @@ let fraction_free stats =
   let { Xen_os.Memory.free_words; heap_words; _ } = stats in
   float free_words /. float heap_words
 
-let meminfo stats =
-  let { Xen_os.Memory.free_words; heap_words; _ } = stats in
-  let mem_total = heap_words * wordsize_in_bytes in
-  let mem_free = free_words * wordsize_in_bytes in
-  Log.info (fun f -> f "Writing meminfo: free %a / %a (%.2f %%)"
-    Fmt.bi_byte_size mem_free
-    Fmt.bi_byte_size mem_total
-    (fraction_free stats *. 100.0));
-  Printf.sprintf "MemTotal: %d kB\n\
-                  MemFree: %d kB\n\
-                  Buffers: 0 kB\n\
-                  Cached: 0 kB\n\
-                  SwapTotal: 0 kB\n\
-                  SwapFree: 0 kB\n" (mem_total / 1024) (mem_free / 1024)
-
 let init () =
   Gc.full_major ()