[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/21] linux-user: introduce preexit_cleanup
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v2 09/21] linux-user: introduce preexit_cleanup |
Date: |
Fri, 29 Jun 2018 21:52:20 +0100 |
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: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
---
linux-user/Makefile.objs | 2 +-
linux-user/exit.c | 28 ++++++++++++++++++++++++++++
linux-user/qemu.h | 8 ++++++++
linux-user/syscall.c | 10 ++--------
4 files changed, 39 insertions(+), 9 deletions(-)
create mode 100644 linux-user/exit.c
diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs
index 59a5c17354..b5dfb71f25 100644
--- a/linux-user/Makefile.objs
+++ b/linux-user/Makefile.objs
@@ -1,7 +1,7 @@
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
diff --git a/linux-user/exit.c b/linux-user/exit.c
new file mode 100644
index 0000000000..aed8713fae
--- /dev/null
+++ b/linux-user/exit.c
@@ -0,0 +1,28 @@
+/*
+ * exit support for qemu
+ *
+ * Copyright (c) 2018 Alex Bennée <address@hidden>
+ *
+ * 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);
+}
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 793cd4df04..bb85c81aa4 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -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.
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 2117fb13b4..7c66442357 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8018,10 +8018,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;
@@ -10127,10 +10124,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
--
2.17.1
- [Qemu-devel] [PATCH v2 05/21] docker: add gcovr to travis image, (continued)
- [Qemu-devel] [PATCH v2 05/21] docker: add gcovr to travis image, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 06/21] travis: add gcovr summary for GCOV build, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 02/21] travis: test out-of-tree builds, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 07/21] build-system: add clean-coverage target, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 08/21] build-system: add coverage-report target, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 10/21] linux-user: add gcov support to preexit_cleanup, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 21/21] .shippable.yml: add linux-user cross-build for ppc-softmmu, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 13/21] docker: ubuntu: Use SDL2, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 11/21] docker: filter out linux-user builds for mingw, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 12/21] docker: ubuntu: Update the package list before installing new ones, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 09/21] linux-user: introduce preexit_cleanup,
Alex Bennée <=
- [Qemu-devel] [PATCH v2 16/21] docker: add env parser to docker.py build step, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 18/21] docker: add special handling for FROM:debian-%-user targets, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 19/21] docker: add special rule for deboostrapped images, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 20/21] docker: add linux-user powered cross builder for QEMU, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 17/21] docker: drop QEMU build-dep from bootstrap, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 15/21] docker: Do not run tests in 'intermediate' images, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 14/21] docker: Clean the MXE base image, Alex Bennée, 2018/06/29