Commit 708b6a64 authored by Alex Bennée's avatar Alex Bennée
Browse files

linux-user: introduce preexit_cleanup 



To avoid repeating ourselves move our preexit clean-up code into a
helper function. I figured the continuing effort to split of the
syscalls made it worthwhile creating a new file for it now.

Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Reviewed-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent fe8bf5f6

linux-user/Makefile.objs

+1 −1
Original line number Diff line number Diff line 
obj-y = main.o syscall.o strace.o mmap.o signal.o \

	elfload.o linuxload.o uaccess.o uname.o \

	safe-syscall.o $(TARGET_ABI_DIR)/signal.o \

        $(TARGET_ABI_DIR)/cpu_loop.o

        $(TARGET_ABI_DIR)/cpu_loop.o exit.o



obj-$(TARGET_HAS_BFLT) += flatload.o

obj-$(TARGET_I386) += vm86.o

linux-user/exit.c

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

 *  exit support for qemu

 *

 *  Copyright (c) 2018 Alex Bennée <alex.bennee@linaro.org>

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by

 *  the Free Software Foundation; either version 2 of the License, or

 *  (at your option) any later version.

 *

 *  This program is distributed in the hope that it will be useful,

 *  but WITHOUT ANY WARRANTY; without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, see <http://www.gnu.org/licenses/>.

 */

#include "qemu/osdep.h"

#include "qemu.h"



void preexit_cleanup(CPUArchState *env, int code)

{

#ifdef TARGET_GPROF

        _mcleanup();

#endif

        gdb_exit(env, code);

}

linux-user/qemu.h

+8 −0
Original line number Diff line number Diff line
@@ -623,6 +623,14 @@ static inline int is_error(abi_long ret) 
    return (abi_ulong)ret >= (abi_ulong)(-4096);

}



/**

 * preexit_cleanup: housekeeping before the guest exits

 *

 * env: the CPU state

 * code: the exit code

 */

void preexit_cleanup(CPUArchState *env, int code);



/* Include target-specific struct and function definitions;

 * they may need access to the target-independent structures

 * above, so include them last.

linux-user/syscall.c

+2 −8
Original line number Diff line number Diff line
@@ -8022,10 +8022,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, 
        }



        cpu_list_unlock();

#ifdef TARGET_GPROF

        _mcleanup();

#endif

        gdb_exit(cpu_env, arg1);

        preexit_cleanup(cpu_env, arg1);

        _exit(arg1);

        ret = 0; /* avoid warning */

        break;
@@ -10131,10 +10128,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, 
#ifdef __NR_exit_group

        /* new thread calls */

    case TARGET_NR_exit_group:

#ifdef TARGET_GPROF

        _mcleanup();

#endif

        gdb_exit(cpu_env, arg1);

        preexit_cleanup(cpu_env, arg1);

        ret = get_errno(exit_group(arg1));

        break;

#endif