From 0e68ab94e561276e9d92a6182157a03aad884cec Mon Sep 17 00:00:00 2001
From: Calascibetta Romain <romain.calascibetta@gmail.com>
Date: Fri, 6 Dec 2024 14:48:23 +0100
Subject: [PATCH] Fix the test about read/atomic_read on block devices

---
 lib/miou_solo5.ml | 3 ++-
 test/block.ml     | 2 +-
 test/run.t        | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/miou_solo5.ml b/lib/miou_solo5.ml
index f4ed320..4af19a0 100644
--- a/lib/miou_solo5.ml
+++ b/lib/miou_solo5.ml
@@ -505,7 +505,8 @@ let select ~block cancelled_syscalls =
         handles := miou_solo5_yield 0;
         if !handles == 0 then go signals else signals
   in
-  let signals = go [] in
+  let signals = consume_block domain [] in
+  let signals = go signals in
   let signals = collect_handles ~handles:!handles domain signals in
   collect_sleepers domain signals
 
diff --git a/test/block.ml b/test/block.ml
index f890798..aa38c5b 100644
--- a/test/block.ml
+++ b/test/block.ml
@@ -17,7 +17,7 @@ let () = Miou_solo5.(run [ block "simple" ]) @@ fun blk () ->
     let hash = Digest.string str in
     Fmt.pr "%08x: %s\n%!" 0 (Digest.to_hex hash)
   in
-  Miou_solo5.Block.atomic_read blk ~off:pagesize bstr;
+  Miou_solo5.Block.read blk ~off:pagesize bstr;
   let str = bigstring_to_string bstr in
   let hash = Digest.string str in
   Fmt.pr "%08x: %s\n%!" pagesize (Digest.to_hex hash);
diff --git a/test/run.t b/test/run.t
index 0e1516c..6218e7e 100644
--- a/test/run.t
+++ b/test/run.t
@@ -42,6 +42,6 @@ Tests some simple unikernels
   Solo5:     rodata @ (0x1c6000 - 0x1f7fff)
   Solo5:       data @ (0x1f8000 - 0x267fff)
   Solo5:       heap >= 0x268000 < stack < 0x20000000
-  00000200: 5e00b6c8f387deac083b9718e08a361b
   00000000: 94a3b2375dd8aa75e3d2cdef54179909
+  00000200: 5e00b6c8f387deac083b9718e08a361b
   Solo5: solo5_exit(0) called