sandbox: remove ram buffer file when U-Boot is loaded by SPL

Update management of "--rm_memory" sandbox's option and force
this option when U-Boot is loaded by SPL in os_spl_to_uboot()
and remove the ram file after reading in main() as described
in option help message: "Remove memory file after reading".

This patch avoids that the file "/tmp/u-boot.mem.XXXXXX" [created in
os_jump_to_file() when U-Boot is loaded by SPL] is never deleted
because state_uninit() is not called after U-Boot execution
(CtrlC or with running pytest for example).

This issue is reproduced by
> build-sandbox_spl/spl/u-boot-spl
  and CtrlC in U-Bot console

> make qcheck

One temp file is created after each SPL and U-Boot execution
(7 tims in qcheck after test_handoff.py, test_ofplatdata.py,
 test_spl.py execution).

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c
index b56fa04a34b5cd497a04c79ffd4200e11767ad1c..80996a91ce7f20db30801fe0bd9c38c694ccf4ae 100644 (file)
--- a/arch/sandbox/cpu/os.c
+++ b/arch/sandbox/cpu/os.c
@@ -790,6 +790,11 @@ int os_find_u_boot(char *fname, int maxlen)
 
 int os_spl_to_uboot(const char *fname)
 {
+       struct sandbox_state *state = state_get_current();
+
+       printf("%s\n", __func__);
+       /* U-Boot will delete ram buffer after read: "--rm_memory"*/
+       state->ram_buf_rm = true;
        return os_jump_to_file(fname);
 }
 

diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index fe494aef752d038b8e48aa37ab446831a424b3ad..8322ed7a1fe135ddab0edfa386c61f7eb1e917f7 100644 (file)
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -457,6 +457,13 @@ int main(int argc, char *argv[])
        if (os_parse_args(state, argc, argv))
                return 1;
 
+       /* Remove old memory file if required */
+       if (state->ram_buf_rm && state->ram_buf_fname) {
+               os_unlink(state->ram_buf_fname);
+               state->write_ram_buf = false;
+               state->ram_buf_fname = NULL;
+       }
+
        ret = sandbox_read_state(state, state->state_fname);
        if (ret)
                goto err;

diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c
index 59f37fab0b8735488cff49469ed6476777da871b..b2901b7a8ca454859a240c3e565129f89edb1878 100644 (file)
--- a/arch/sandbox/cpu/state.c
+++ b/arch/sandbox/cpu/state.c
@@ -415,10 +415,6 @@ int state_uninit(void)
                }
        }
 
-       /* Remove old memory file if required */
-       if (state->ram_buf_rm && state->ram_buf_fname)
-               os_unlink(state->ram_buf_fname);
-
        /* Delete this at the last moment so as not to upset gdb too much */
        if (state->jumped_fname)
                os_unlink(state->jumped_fname);