From patchwork Mon Jul 2 14:30:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 140788 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp37220ljj; Mon, 2 Jul 2018 07:43:44 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfdEpV2mu1fH38ALd4u1+788bO05C2XlrIOz92yUancGF4hBYW9u0ojWF+1IN4tGW8JhU0y X-Received: by 2002:aed:2043:: with SMTP id 61-v6mr24051697qta.378.1530542623903; Mon, 02 Jul 2018 07:43:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542623; cv=none; d=google.com; s=arc-20160816; b=nytH6JUhjnMq/z2DzAAepW7MqeHsVxTS/TuzRhqgQ4lc1iJLHymQeleiV9b9NFT6t2 3VXfrxwn65jV7UR/IeCS/VKZGSFTgZi+nApg0D7kAFy+YUyVvJ1pq8bJ3+z82KVyWXCm BO4EpkmFOsjC3jl1p9+UsddaJPNWhLCEIqh5kmM2i4dy56A65nzVFhUl0zS/lVSVhKVE P4CREfWUeGMCVSgnf0Zrt2NdZPUyuOeRM+8XWSXYjsajHr6ltibVk71C8AMKDZuuLcg1 KGQHFEtM+0BaaCRaxZ37ITl+iHSUOMYxQ89EzX5KkkDhYT0+mwXJyXCR11TdVBb3fYd7 nNmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=zKvfgaXYdJINmHzOqmZqPpLa383uDorjeNqDKhLCuZc=; b=cHsrSLXxXYISVJezxylnaLMDMxbALCkWkY5CracrLQiIyaafldIifYKGfLjqV06tK7 aXF4NuuwY6vD40x5w7GQkpvnWa2pG8sJ+5dhgygW3iChUV1DHK7xvsskeM+qWP2dEquS Fb8nRCC1Cfyc8e81wXjkoyzLA7OQzf/gHaQ+71cN3Iy/lbZRqEBCFnC+Av5rL0BFaz6h vj0ZGTHADx2qf/iRT4Q44zHBvnXNksBd9zYmKGhNwHTo6b1NhxS7NTYWfbOPDhkYVb4l q1HPiyyMiWqDleix8zkXuZTGQOc6Sp3yxJAAYUvFRaWPg0ky7f2dVaSNJK/LfM1rtIJY olqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dp3Il7+9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y15-v6si1979807qvj.254.2018.07.02.07.43.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:43:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dp3Il7+9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa03L-0007VA-7U for patch@linaro.org; Mon, 02 Jul 2018 10:43:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzqe-0005Sv-39 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzqc-0000WY-II for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:36 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:45092) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzqc-0000W9-Aq for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:30:34 -0400 Received: by mail-wr0-x241.google.com with SMTP id u7-v6so15773836wrn.12 for ; Mon, 02 Jul 2018 07:30:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zKvfgaXYdJINmHzOqmZqPpLa383uDorjeNqDKhLCuZc=; b=dp3Il7+9DV7yEDnHO+6ESIhmLSvRtIgSe9J1KeaH4eK0CnspNOdytsJFmkgZu80q9h LNPl26UMAtW2xJasWb+uN9EgjXYxYF1YUuanTKrsvIoZ8+23bzzO2Dmhf8DcCKhrKeA3 SPjjuUZntLkb3icN4uHwS+UECgwaucWNCJnG8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zKvfgaXYdJINmHzOqmZqPpLa383uDorjeNqDKhLCuZc=; b=FygZL8wMoazTrJ2Dy2QpawhhtS96u4PlUIzxVw9BlP0FD47vMQlZUBOzPCEiqYk2Pb Dvuq7xoZMLs4BA2W2pSMdA8Kc3BXDXK6BS/wesmBpnRdbsMEpxZPRo0zZxP8fqil570G TRwr+ka4jWq3xw8UE76yQhxER37YpMw9MJv1wLxIOJfje/Y72kGRsJYS2W7V0N/svI/G 5tJqVlp55HefqtLWsgIUmRf+/JzvrnNfRnFaFHwa/8EQ16ogq3KlVJl9fE3Axu4SGKAM uUOu93llBW5li1UXi2C2hd5V6ID1NUaTr5A3jym2kB9UOP/cY64t6wq42ARuBVzsxvDw MsnA== X-Gm-Message-State: APt69E0+6IaQvtoKNlWGdIhv6F5K1q1L1xcEGIzierdq4qv5QvtQJtAK +xlACjeOHFitpEPzhy8em0LeHQ== X-Received: by 2002:adf:acc3:: with SMTP id o61-v6mr20829661wrc.34.1530541833181; Mon, 02 Jul 2018 07:30:33 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r194-v6sm337237wmd.36.2018.07.02.07.30.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:30:28 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 764FE3E07D1; Mon, 2 Jul 2018 15:30:22 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Mon, 2 Jul 2018 15:30:10 +0100 Message-Id: <20180702143021.18864-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PATCH v3 09/20] linux-user: introduce preexit_cleanup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, Riku Voipio , =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , qemu-devel@nongnu.org, Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Laurent Vivier --- 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 -- 2.17.1 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 + * + * 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 . + */ +#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