From patchwork Mon May 10 22:15:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12249385 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 734B6C433ED for ; Mon, 10 May 2021 22:18:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BEC776147E for ; Mon, 10 May 2021 22:18:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BEC776147E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgEE7-0000tQ-RR for qemu-devel@archiver.kernel.org; Mon, 10 May 2021 18:18:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgEBW-0004KV-5r for qemu-devel@nongnu.org; Mon, 10 May 2021 18:15:30 -0400 Received: from mail-ot1-x333.google.com ([2607:f8b0:4864:20::333]:44822) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgEBU-000174-DN for qemu-devel@nongnu.org; Mon, 10 May 2021 18:15:29 -0400 Received: by mail-ot1-x333.google.com with SMTP id r26-20020a056830121ab02902a5ff1c9b81so15838320otp.11 for ; Mon, 10 May 2021 15:15:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Dg6NYMP0vhtc+/J2gH0FjUFOnAnUaOi95JsOKkGvxBc=; b=z1w+7XnrXnJChMPNUkPC7Nu6pPHLeR39Kq57qJYT8YVQ18es97KnMp4ODjVBHheVer tQfj6DX01nKR0FpD+D4B+o+/zgIwZ5mdNV/MAQte9JaYN/xuZnxdAhQ1IHEfJpMG9RhD pi0vAwK242RGC4tJ7WRd336SoR+vIwGFOxC5B0MU4dzdtARgE4npUoyb0/IRi1iNKeQy ocbnNBcmhwzFfkANRxIqfRq01upF5oN9Pm8To8ApMJJGPUqdqEzM8pqYlA4z5anIy9We M72/a1FbYIuCMTwsA3QWhqMNWV/9zYT4VdcXU24j2qbXETO1Vzj1Te6d99hphipyrnyl Edug== 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=Dg6NYMP0vhtc+/J2gH0FjUFOnAnUaOi95JsOKkGvxBc=; b=i7jc/50mCXh+mIjG45PUFfN30OpBpPOtE3lOY8QDn5Z7vGYNLTJlO2pkRGgXD43sRw C6R92AM1GuUlZ7klQ2fKBnj6baa3CA6bWh2mRbZGeX87+EY0Yb/TqhFey1Fwvk37Q98g l9aGWX2TavN8g1mQMDCJLMHYrkDLnoSRQBvwG1V5cGAGcqG5DKySo7IGGJDfCs7C8m08 dTvx91RxpStrOTK8fFUDS2gpDq4RKhi2nrX6w+3HqiVEC4ayJLyb2RyalfkGD+Qxn2u6 yLiz5k5z5repu9XqXsvTqQk+CJJSbNKv4LFuMHEtk6i+yiOcfHkmNqg92UK+Zsfd96TL NQ9w== X-Gm-Message-State: AOAM531yubedIWrdmb6GXBubZJvQL6cV+STm/14xZcIyWeOJ5UQdlfpU q3bqkz4P8FoAcrcGRBccb4lsT4MtpBdTCA== X-Google-Smtp-Source: ABdhPJzjWAje/dpfDzGY0Q4eXovreOwBeKcam8iehiM1MUButQ8ehjbu8m9+bqsOHfE9xR/Tm0fH9w== X-Received: by 2002:a9d:684e:: with SMTP id c14mr22928708oto.295.1620684926755; Mon, 10 May 2021 15:15:26 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id p64sm2874405oib.57.2021.05.10.15.15.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 May 2021 15:15:26 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PATCH 1/3] bsd-user: remove target_signal.h, it's unused Date: Mon, 10 May 2021 16:15:09 -0600 Message-Id: <20210510221511.14205-2-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210510221511.14205-1-imp@bsdimp.com> References: <20210510221511.14205-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::333; envelope-from=imp@bsdimp.com; helo=mail-ot1-x333.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kevans@freebsd.org, Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Remove the target_signal.h file. None of its contents are currently used and the bsd-user fork doesn't use them (so this reduces the diffs there). Signed-off-by: Warner Losh --- bsd-user/i386/target_signal.h | 20 -------------------- bsd-user/qemu.h | 1 - bsd-user/signal.c | 1 - bsd-user/sparc/target_signal.h | 27 --------------------------- bsd-user/sparc64/target_signal.h | 27 --------------------------- bsd-user/x86_64/target_signal.h | 19 ------------------- 6 files changed, 95 deletions(-) delete mode 100644 bsd-user/i386/target_signal.h delete mode 100644 bsd-user/sparc/target_signal.h delete mode 100644 bsd-user/sparc64/target_signal.h delete mode 100644 bsd-user/x86_64/target_signal.h diff --git a/bsd-user/i386/target_signal.h b/bsd-user/i386/target_signal.h deleted file mode 100644 index 2ef36d1f98..0000000000 --- a/bsd-user/i386/target_signal.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef TARGET_SIGNAL_H -#define TARGET_SIGNAL_H - -#include "cpu.h" - -/* this struct defines a stack used during syscall handling */ - -typedef struct target_sigaltstack { - abi_ulong ss_sp; - abi_long ss_flags; - abi_ulong ss_size; -} target_stack_t; - - -static inline abi_ulong get_sp_from_cpustate(CPUX86State *state) -{ - return state->regs[R_ESP]; -} - -#endif /* TARGET_SIGNAL_H */ diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 5a82722281..369c649fe5 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -38,7 +38,6 @@ extern enum BSDType bsd_type; #include "syscall_defs.h" #include "target_syscall.h" -#include "target_signal.h" #include "exec/gdbstub.h" #if defined(CONFIG_USE_NPTL) diff --git a/bsd-user/signal.c b/bsd-user/signal.c index f6f7aa2427..ad6d935569 100644 --- a/bsd-user/signal.c +++ b/bsd-user/signal.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "qemu.h" -#include "target_signal.h" void signal_init(void) { diff --git a/bsd-user/sparc/target_signal.h b/bsd-user/sparc/target_signal.h deleted file mode 100644 index 5b2abba40f..0000000000 --- a/bsd-user/sparc/target_signal.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef TARGET_SIGNAL_H -#define TARGET_SIGNAL_H - -#include "cpu.h" - -/* this struct defines a stack used during syscall handling */ - -typedef struct target_sigaltstack { - abi_ulong ss_sp; - abi_long ss_flags; - abi_ulong ss_size; -} target_stack_t; - - -#ifndef UREG_I6 -#define UREG_I6 6 -#endif -#ifndef UREG_FP -#define UREG_FP UREG_I6 -#endif - -static inline abi_ulong get_sp_from_cpustate(CPUSPARCState *state) -{ - return state->regwptr[UREG_FP]; -} - -#endif /* TARGET_SIGNAL_H */ diff --git a/bsd-user/sparc64/target_signal.h b/bsd-user/sparc64/target_signal.h deleted file mode 100644 index 5b2abba40f..0000000000 --- a/bsd-user/sparc64/target_signal.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef TARGET_SIGNAL_H -#define TARGET_SIGNAL_H - -#include "cpu.h" - -/* this struct defines a stack used during syscall handling */ - -typedef struct target_sigaltstack { - abi_ulong ss_sp; - abi_long ss_flags; - abi_ulong ss_size; -} target_stack_t; - - -#ifndef UREG_I6 -#define UREG_I6 6 -#endif -#ifndef UREG_FP -#define UREG_FP UREG_I6 -#endif - -static inline abi_ulong get_sp_from_cpustate(CPUSPARCState *state) -{ - return state->regwptr[UREG_FP]; -} - -#endif /* TARGET_SIGNAL_H */ diff --git a/bsd-user/x86_64/target_signal.h b/bsd-user/x86_64/target_signal.h deleted file mode 100644 index 659cd401b8..0000000000 --- a/bsd-user/x86_64/target_signal.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef TARGET_SIGNAL_H -#define TARGET_SIGNAL_H - -#include "cpu.h" - -/* this struct defines a stack used during syscall handling */ - -typedef struct target_sigaltstack { - abi_ulong ss_sp; - abi_long ss_flags; - abi_ulong ss_size; -} target_stack_t; - -static inline abi_ulong get_sp_from_cpustate(CPUX86State *state) -{ - return state->regs[R_ESP]; -} - -#endif /* TARGET_SIGNAL_H */ From patchwork Mon May 10 22:15:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12249371 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4886C433ED for ; Mon, 10 May 2021 22:16:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B72BB61019 for ; Mon, 10 May 2021 22:16:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B72BB61019 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgECV-0006Ny-Lu for qemu-devel@archiver.kernel.org; Mon, 10 May 2021 18:16:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgEBW-0004L2-H3 for qemu-devel@nongnu.org; Mon, 10 May 2021 18:15:30 -0400 Received: from mail-oi1-x229.google.com ([2607:f8b0:4864:20::229]:34648) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgEBU-00017h-VW for qemu-devel@nongnu.org; Mon, 10 May 2021 18:15:30 -0400 Received: by mail-oi1-x229.google.com with SMTP id l6so17258212oii.1 for ; Mon, 10 May 2021 15:15:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QZYqQKuDETSDlfQMwi/K3kvQYbYQppdk7ceGQ960fsc=; b=Bcvjder7QqdVLEVUzjHPQRPtbZYmFbGHW2hvJXQHnD0NaiT1qb+EzAcbcgg1WEz2FJ 5zDQVSoejZPHbLGg2kNsMwueVm22Ivb/oUYS5nl7prckG79zKCdDiYgLsz/sl3RCX1IF 2BLtDlVTL+Hv/tEJm5BIKIg4vDWj9l5unZi8OsoHdlIV71Hz3sXSfWrxP6MGU6OkDEZD RBbJT95eXaOnCCjalZZXbIX5LvuEfDpub78Es1N4m8l0YqeJzyIGEW51oU4qVTdakkpx Oilxw9JWLjkkpOEBslAKsX+Hx/7tAeKTA/27rEc3q89K2SJ8k9zuoPdt/S1aUt7iDOiE P8yQ== 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=QZYqQKuDETSDlfQMwi/K3kvQYbYQppdk7ceGQ960fsc=; b=FDHlgPx1ZNIk5/qpkdOokXufMM5HIBPD1lc3TgusamlYOfEoBo5qYL/DY2svmssQaL 58b43C7UgXBaLEFMuDG3Q9X8856a8aC3PVIokyuBgZnLIcyP4N0ygbcj4ioQqQsVoOux 53DqtyhfS/2u2MMh8GorMJfu5TEjsHzfLWQ9NtpL3QLwRX9YVoU9bJh0CWiSvAbSGnQn EFXXMITa1DHqiB/0bKzTQK27tIrTmh4I6pdjC7/fJ6pz3iVF/6lpSGVhoH5kLYVEIALk UCQwxdxaKG/Xdi9rTHJpWHeAOD7ikcVahmxoOgw6Q1I+OXa3a2AmW2DLbe13zBw2zO6I 6mlA== X-Gm-Message-State: AOAM532SgmhWgLR7BlLYJ1nt4M6taqIx41BQf9OfArkTH4R8fjSOcItO 9kAPJ8RsBsedeBS7CMQgXsBkUyUAU8Ihug== X-Google-Smtp-Source: ABdhPJz1KnoaiAa8ZcxS20q6xKL9XhDrPc6tXXdYy5zx8mhi/WjWDrxnebGyzsNlsWMPSZlYBzknYQ== X-Received: by 2002:a05:6808:313:: with SMTP id i19mr5934555oie.53.1620684927585; Mon, 10 May 2021 15:15:27 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id p64sm2874405oib.57.2021.05.10.15.15.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 May 2021 15:15:27 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PATCH 2/3] bsd-user: Stop building the sparc platforms Date: Mon, 10 May 2021 16:15:10 -0600 Message-Id: <20210510221511.14205-3-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210510221511.14205-1-imp@bsdimp.com> References: <20210510221511.14205-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::229; envelope-from=imp@bsdimp.com; helo=mail-oi1-x229.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kevans@freebsd.org, Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The forked bsd-user tree doesn't really support these platforms. They aren't functional at the moment anyway. Remove them from the build so that the major reorg patch series can focus on one platform (x86) before adding addition platforms once things are shuffled. This should make it easier to review and satisfy that all revisions of a patch series are buildable. Signed-off-by: Warner Losh --- default-configs/targets/sparc-bsd-user.mak | 3 --- default-configs/targets/sparc64-bsd-user.mak | 4 ---- 2 files changed, 7 deletions(-) delete mode 100644 default-configs/targets/sparc-bsd-user.mak delete mode 100644 default-configs/targets/sparc64-bsd-user.mak diff --git a/default-configs/targets/sparc-bsd-user.mak b/default-configs/targets/sparc-bsd-user.mak deleted file mode 100644 index 9ba3d7b07f..0000000000 --- a/default-configs/targets/sparc-bsd-user.mak +++ /dev/null @@ -1,3 +0,0 @@ -TARGET_ARCH=sparc -TARGET_ALIGNED_ONLY=y -TARGET_WORDS_BIGENDIAN=y diff --git a/default-configs/targets/sparc64-bsd-user.mak b/default-configs/targets/sparc64-bsd-user.mak deleted file mode 100644 index 8dd3217800..0000000000 --- a/default-configs/targets/sparc64-bsd-user.mak +++ /dev/null @@ -1,4 +0,0 @@ -TARGET_ARCH=sparc64 -TARGET_BASE_ARCH=sparc -TARGET_ALIGNED_ONLY=y -TARGET_WORDS_BIGENDIAN=y From patchwork Mon May 10 22:15:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Warner Losh X-Patchwork-Id: 12249373 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DF6EC433B4 for ; Mon, 10 May 2021 22:16:37 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1C122611CA for ; Mon, 10 May 2021 22:16:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1C122611CA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgECa-0006Ri-4j for qemu-devel@archiver.kernel.org; Mon, 10 May 2021 18:16:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgEBX-0004Nk-T0 for qemu-devel@nongnu.org; Mon, 10 May 2021 18:15:31 -0400 Received: from mail-ot1-x336.google.com ([2607:f8b0:4864:20::336]:35744) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgEBW-00018g-8Y for qemu-devel@nongnu.org; Mon, 10 May 2021 18:15:31 -0400 Received: by mail-ot1-x336.google.com with SMTP id 69-20020a9d0a4b0000b02902ed42f141e1so5667596otg.2 for ; Mon, 10 May 2021 15:15:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IZfggWCaQ+1RfHRqfpMCTeEbyU3GDPb25L1jnEm8AZs=; b=zf7/YaHnNcQtsRCNm4TJiG7xitgcpjtlue4mKDJJgpGlaKhBUFztuCsmB0h7Y7PsAS 0yDaOKZ3oiQZHEn9aXi5ViMJ9mA1cFdSdMWVU4FKoy+4cETRWOG8oij1YY1DWLkPaXnY irHld5d/9dZCTaQqgxQw66tCLEz58eTk3BTKw11iKapYHH9PiZMjjW7p3/EXdq9y3SGc Y7oHwaGdVbLraJJpEt0IBlOnz201o8G2wSu9XMy/4CP2xoXniSAXEo01CbY84G+Cf4TE 5PMi9XN039LK26LF1P2wpj4kn71Om88w7geExymBYIRVbkyyfCYkXIrkIKaTkRRBYRP1 NIyA== 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=IZfggWCaQ+1RfHRqfpMCTeEbyU3GDPb25L1jnEm8AZs=; b=RJksmO7BcFCnpJN0QXtbwv0WjeC43YLMVZkoA0WaLKtF9qhLV1pTLKbM7ugxEORv4G BCToJyWNQxW/olKu5I5HEXUYI7P1fDlVGuEsZY9/+qERArHqgWpG7DapN9JFuMEEXsOg vJQ2mBbHbbNAFdouNXLDMq8bYA8ZPMcCCXJOOd+KquXOiUhNvBsbdoTErUs09r0bVryR Tj2ms+IYcKFSc2TzIt8KtdPdumWAGsLYe31P4lHiy8/DuUKO+LrNXc5xmAmb7j56WPPo Hki0nPJNA3hN9y3SL3MWKvYHrLGsrZNLtQf+fnR+TRgkGV6S/CjbYbLL3mm33jPVeM/i 2YzQ== X-Gm-Message-State: AOAM530AFFX4AsRHVca4Qf1Ld+CJUqBdSFLsFfDdgm8eJcqnn9/OOi63 qnwNMzqwQ7PZilV9fccOjCieo1OJTIlfAg== X-Google-Smtp-Source: ABdhPJwfnKUxZh6oF+Hs5RAPEQEWFjcwDt84gMw4g7O6uyzHxRoYfQg2PRsENYuvaS9racNobqXlHw== X-Received: by 2002:a9d:425:: with SMTP id 34mr23379081otc.25.1620684928593; Mon, 10 May 2021 15:15:28 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id p64sm2874405oib.57.2021.05.10.15.15.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 May 2021 15:15:27 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PATCH 3/3] bsd-user: rename linux_binprm to bsd_binprm Date: Mon, 10 May 2021 16:15:11 -0600 Message-Id: <20210510221511.14205-4-imp@bsdimp.com> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20210510221511.14205-1-imp@bsdimp.com> References: <20210510221511.14205-1-imp@bsdimp.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::336; envelope-from=imp@bsdimp.com; helo=mail-ot1-x336.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kevans@freebsd.org, Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Rename linux_binprm to bsd_binprm to reflect that we're loading BSD binaries, not ELF ones. Signed-off-by: Warner Losh --- bsd-user/bsdload.c | 4 ++-- bsd-user/elfload.c | 4 ++-- bsd-user/qemu.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bsd-user/bsdload.c b/bsd-user/bsdload.c index e1ed3b7b60..8d83f21eda 100644 --- a/bsd-user/bsdload.c +++ b/bsd-user/bsdload.c @@ -32,7 +32,7 @@ static int count(char **vec) return i; } -static int prepare_binprm(struct linux_binprm *bprm) +static int prepare_binprm(struct bsd_binprm *bprm) { struct stat st; int mode; @@ -127,7 +127,7 @@ abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp, int loader_exec(const char *filename, char **argv, char **envp, struct target_pt_regs *regs, struct image_info *infop) { - struct linux_binprm bprm; + struct bsd_binprm bprm; int retval; int i; diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index 5f4d824d78..d658d722a5 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -662,7 +662,7 @@ static abi_ulong copy_elf_strings(int argc,char ** argv, void **page, return p; } -static abi_ulong setup_arg_pages(abi_ulong p, struct linux_binprm *bprm, +static abi_ulong setup_arg_pages(abi_ulong p, struct bsd_binprm *bprm, struct image_info *info) { abi_ulong stack_base, size, error; @@ -1143,7 +1143,7 @@ static void load_symbols(struct elfhdr *hdr, int fd) syminfos = s; } -int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, +int load_elf_binary(struct bsd_binprm * bprm, struct target_pt_regs * regs, struct image_info * info) { struct elfhdr elf_ex; diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 369c649fe5..5c33b4279f 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -114,7 +114,7 @@ extern unsigned long mmap_min_addr; * This structure is used to hold the arguments that are * used when loading binaries. */ -struct linux_binprm { +struct bsd_binprm { char buf[128]; void *page[MAX_ARG_PAGES]; abi_ulong p; @@ -132,9 +132,9 @@ abi_ulong loader_build_argptr(int envc, int argc, abi_ulong sp, int loader_exec(const char * filename, char ** argv, char ** envp, struct target_pt_regs * regs, struct image_info *infop); -int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, +int load_elf_binary(struct bsd_binprm * bprm, struct target_pt_regs * regs, struct image_info * info); -int load_flt_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, +int load_flt_binary(struct bsd_binprm * bprm, struct target_pt_regs * regs, struct image_info * info); abi_long memcpy_to_target(abi_ulong dest, const void *src,