From patchwork Fri Aug 18 17:57:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 714686 Delivered-To: patch@linaro.org Received: by 2002:a5d:484e:0:b0:317:ecd7:513f with SMTP id n14csp648394wrs; Fri, 18 Aug 2023 10:58:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG/yYCh+4jNnNYo7K2XsugFBur9NvQCbH+7gjOLYlf9fmaSB4EbsmWDsEetQxsaLGimAHir X-Received: by 2002:a05:620a:25c9:b0:767:3cfc:32aa with SMTP id y9-20020a05620a25c900b007673cfc32aamr4396472qko.21.1692381532629; Fri, 18 Aug 2023 10:58:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692381532; cv=none; d=google.com; s=arc-20160816; b=04L/wFfRKlAGKrjRGXYiA3oQZOrv1skMP2RhzWideCsGySAVra/fAC8B49Zwoid5G1 HJe0ed90Sb4oLf3hCZjlaMPre/uyqmsR/KEltA9UAWcjCIBlXImOIHTfa2geu+xc2jUr 8zI+dwz03uc8iTy1ad6KVMT8Z2UgbJthBcd7Vo4Ou2xc+56ginQi87x47JCLECO4kwOK ZhWhIXCVs2jun0K0LdX2bZLujgPdCKeRawi2wtmgIdNYIUp8vZQMxGg/cUy0aXpHEeml f8UTWs6myfWKsZLou2+a55cTKarkhKwGlDBGcjZ2nNiiuAogmQENIKPldlPl2MD8c90y N9WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=249sRNpBkee3vxDmEKQSDMH45KuQ5/RjIJ294wQlUMs=; fh=IDR3SL6lwvblHJPJmbQ3/YzQ4jmMC8ZC3/QokybUV7g=; b=p/TCZn3ybaDPKw6WC1+3X7qFkiy6oAToefQ+zvd+S3DNnW256WxPd0wC5kyaE5Bxn/ oOJwPHtFfRh7DAHygqirT8KMT80yc+9f4r+wLE3UFBfKFjAWXt2SbonGgUeDU86CKEj3 9j7bzIAB9d6mCNXdYGsbuwJk8Q7bz/Fsly5ZkIzAcqf2xIMlC/BDH1n0hQjmLrVhpAXQ BS4Ym8DoHa4i3D4DxpHUyz1BK8oqYnUy47a9O5LvYKBPg1xvgaQUbeEDzmHA6fslVjjl URyiCpjV2m90QhvP3puccu4GqGm+EqQ/ln3TH+cuO8kUdB34U7orG2qtu7wLxcp5j4NT fO+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HqLOi77x; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m20-20020a05620a291400b0076d7179e045si1625325qkp.46.2023.08.18.10.58.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Aug 2023 10:58:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HqLOi77x; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qX3jD-00010Y-RT; Fri, 18 Aug 2023 13:57:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qX3jC-0000zM-9o for qemu-devel@nongnu.org; Fri, 18 Aug 2023 13:57:42 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qX3jA-00049Z-3W for qemu-devel@nongnu.org; Fri, 18 Aug 2023 13:57:42 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-68872ca740bso988398b3a.2 for ; Fri, 18 Aug 2023 10:57:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692381458; x=1692986258; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=249sRNpBkee3vxDmEKQSDMH45KuQ5/RjIJ294wQlUMs=; b=HqLOi77xM81ARqzXiwXGuWtrQx2tnaNbti6NKcZfOWbdS4txF9jEveQt7txGl2VX/q +aCNs+crFfjySHSmIEGbxkqRcQGaTivb6e7uPU9AqIdePiKqzoQcuqMI5G73UdiQ+3mF UtM1DacsrPo5U+pxY1xcQykHMVSxoIjdTibTjPvyh0oh/pMkUYLdcGwDAqoutITBBkQR jsoAS+Ct2PXPnV3Ziqyi1/lyNPVQJBgsw7JcEHS4mtcv9FHerzshRNxY+w2OUiqilITd sCt15/E518iDcD4gWG+9oLaqTaTS/W0WJT1ZSQH9vF0YFBvi0Ie9pKgts+rPeGzZtCAy Y/cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692381458; x=1692986258; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=249sRNpBkee3vxDmEKQSDMH45KuQ5/RjIJ294wQlUMs=; b=CbYPV814UgYWb+B8joJmdE1zgj2OzVCsVIZbs5ttGWhccOoXR7VMPswgBjwQ32T7bF CSq+E6v2yIlzcz6FZuDVrSnw0GU25ullwlYaWBlhLaBt7fOyDav3mE44vJSV6ql7wsJ0 Wb+Iar2cyndBDCakVmaunx3IqwnpV2vccXYuRUo11YvYFu4gNyoBghNGFJ5JNQEdxKkx Ji2Pukuix5q0Uk4Hd82bp31juOGbDXXbpBGAYFUfDb9wdPJnFKbyWU8sn1n64FDbderg OCOsyZhPyGafuzFidg1ntdrCbbrIefX+g68lps4QnWn4j1bwINmvOpsHBefxghYMqC5N H5tw== X-Gm-Message-State: AOJu0YzlzDldodzS+v7xoFKkAXME7GsHa/P4aF+0dlqwknP04Ka8QUW1 jGPksFS+d24guMJ3J1VcWOXta2btw3mT3+oslEs= X-Received: by 2002:a05:6a20:12ca:b0:140:6d68:ce07 with SMTP id v10-20020a056a2012ca00b001406d68ce07mr4784928pzg.52.1692381458589; Fri, 18 Aug 2023 10:57:38 -0700 (PDT) Received: from stoup.. ([2602:47:d483:7301:cf24:6daf:2b9e:7972]) by smtp.gmail.com with ESMTPSA id q11-20020a638c4b000000b005637030d00csm1838212pgn.30.2023.08.18.10.57.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:57:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: imp@bsdimp.com Subject: [PATCH 1/3] bsd-user: Remove ELF_START_MMAP and image_info.start_mmap Date: Fri, 18 Aug 2023 10:57:34 -0700 Message-Id: <20230818175736.144194-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230818175736.144194-1-richard.henderson@linaro.org> References: <20230818175736.144194-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The start_mmap value is write-only. Remove the field and the defines that populated it. Signed-off-by: Richard Henderson Reviewed-by: Warner Losh --- bsd-user/arm/target_arch_elf.h | 1 - bsd-user/i386/target_arch_elf.h | 1 - bsd-user/qemu.h | 1 - bsd-user/x86_64/target_arch_elf.h | 1 - bsd-user/elfload.c | 1 - 5 files changed, 5 deletions(-) diff --git a/bsd-user/arm/target_arch_elf.h b/bsd-user/arm/target_arch_elf.h index 935bce347f..b1c0fd2b32 100644 --- a/bsd-user/arm/target_arch_elf.h +++ b/bsd-user/arm/target_arch_elf.h @@ -20,7 +20,6 @@ #ifndef TARGET_ARCH_ELF_H #define TARGET_ARCH_ELF_H -#define ELF_START_MMAP 0x80000000 #define ELF_ET_DYN_LOAD_ADDR 0x500000 #define elf_check_arch(x) ((x) == EM_ARM) diff --git a/bsd-user/i386/target_arch_elf.h b/bsd-user/i386/target_arch_elf.h index cbcd1f08e2..4ac27b02e7 100644 --- a/bsd-user/i386/target_arch_elf.h +++ b/bsd-user/i386/target_arch_elf.h @@ -20,7 +20,6 @@ #ifndef TARGET_ARCH_ELF_H #define TARGET_ARCH_ELF_H -#define ELF_START_MMAP 0x80000000 #define ELF_ET_DYN_LOAD_ADDR 0x01001000 #define elf_check_arch(x) (((x) == EM_386) || ((x) == EM_486)) diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 8f2d6a3c78..178114b423 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -52,7 +52,6 @@ struct image_info { abi_ulong end_data; abi_ulong start_brk; abi_ulong brk; - abi_ulong start_mmap; abi_ulong mmap; abi_ulong rss; abi_ulong start_stack; diff --git a/bsd-user/x86_64/target_arch_elf.h b/bsd-user/x86_64/target_arch_elf.h index b244711888..e51c2faf08 100644 --- a/bsd-user/x86_64/target_arch_elf.h +++ b/bsd-user/x86_64/target_arch_elf.h @@ -20,7 +20,6 @@ #ifndef TARGET_ARCH_ELF_H #define TARGET_ARCH_ELF_H -#define ELF_START_MMAP 0x2aaaaab000ULL #define ELF_ET_DYN_LOAD_ADDR 0x01021000 #define elf_check_arch(x) (((x) == ELF_ARCH)) diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index 1f650bdde8..38a3439d2c 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -738,7 +738,6 @@ int load_elf_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs, /* OK, This is the point of no return */ info->end_data = 0; info->end_code = 0; - info->start_mmap = (abi_ulong)ELF_START_MMAP; info->mmap = 0; elf_entry = (abi_ulong) elf_ex.e_entry; From patchwork Fri Aug 18 17:57:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 714684 Delivered-To: patch@linaro.org Received: by 2002:a5d:484e:0:b0:317:ecd7:513f with SMTP id n14csp648250wrs; Fri, 18 Aug 2023 10:58:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGcJ3AYmnrTBgUfqeJqyBOLyUNks4h44tst+Av4yGwHo7qT8Fb/G1tF2nTjmgOWKNUBtF11 X-Received: by 2002:a05:6214:57d6:b0:641:8e87:6d19 with SMTP id lw22-20020a05621457d600b006418e876d19mr3666078qvb.17.1692381511228; Fri, 18 Aug 2023 10:58:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692381511; cv=none; d=google.com; s=arc-20160816; b=dhR98Fn8PODZcgD1f5Sp2XfmC8g4SAmzva5XkvHXwgrXRtMXjcnDI0PcDI0hSxdiaT dyPHYim6WkZfLufQ4Wp5EJwvrOInJYN692lV1qdmDTxxoF02Hg7I8eZJJNqx9v7vz1VP oZBclYQXQfyd3lLX2jWAHG2yjWyMWCNmE90hcV12UsMNfZUecg0j2MOmuBQ2irfNC4Y3 IR3S+1+R6I201K/LBE905cwiv1wmhL73/usVKtPQxDPYnzycpUp5OwXGmTALeoG53bYy vQoNFPnihHDJCQKorfBMiT+27LylWP7qFDBxVWTRH4cmRjWSsKfXa9CBCX2TnSyALnTc AkJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=wdilCwPFymanBcvogkn2wHE26a1921DHapwmojyGce8=; fh=IDR3SL6lwvblHJPJmbQ3/YzQ4jmMC8ZC3/QokybUV7g=; b=MjulwdZzWuhRFK9LDCBwOvMrLsmKZw/d0PuIbsVXySmqpnneTfsFxy0Vzri14UUkuH XtD2GvhjY1u6VyR+r59TDaZXrwSwmqPOTQbQJhS4fRD9rF897QtTmA1pOm2PdETtMduL BKmkV8RnuJxAh/bsnePckczJmI4pl9WdEP1uAJAE0AqmFj2i1afxX36lND6ygzY4Z11L KvnbBJ6xj0v4pn69UikBcg+NhQOt6FDG6QdWhns7YGMiNnMRGBf3DRVpt6H+8Z8+80BB W3B+Hn8SD6d2pTx5XmBzsagXhb5YItmVU8Qn0ni/pWLEEOGSfEt/e2V69jUNZ4GYVMTY 1bFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dvpTnjst; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j2-20020a0cf502000000b0063d390478f2si1575519qvm.23.2023.08.18.10.58.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Aug 2023 10:58:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dvpTnjst; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qX3jE-00011O-Vj; Fri, 18 Aug 2023 13:57:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qX3jD-00010D-67 for qemu-devel@nongnu.org; Fri, 18 Aug 2023 13:57:43 -0400 Received: from mail-oi1-x236.google.com ([2607:f8b0:4864:20::236]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qX3jA-00049k-Jx for qemu-devel@nongnu.org; Fri, 18 Aug 2023 13:57:42 -0400 Received: by mail-oi1-x236.google.com with SMTP id 5614622812f47-3a82db15081so761891b6e.0 for ; Fri, 18 Aug 2023 10:57:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692381459; x=1692986259; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wdilCwPFymanBcvogkn2wHE26a1921DHapwmojyGce8=; b=dvpTnjst9JON6CPOj3DAs2EIk93Jw9Tq8eEBxgDUlBWA59ZI0fScmRjP4ZFfSKVZZD qWT5I2E1RTkUS8Jq1XJmzkKUa/kjeQQ6Z+BlU07nQHt2/Q82s6MSxniLvPGoxPToaJ7t h697aKhHahnyDqXTUUfIw7sqasTJPldfHq4S7DEIlCodGfpademdxsN4QVirzDljAoZw RlChNGzv/fsblA9e6IuKWw4qy4fe44Bvf1VU/jvf27dO6jnnqB6p6AmobULrZPhIwey+ RAA0KX721cT0y2QHVFR0N4PZMIhId8HNW/oM61vPECzCr9TedJHXpKH1FU9TnWYH5Q9O AlLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692381459; x=1692986259; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wdilCwPFymanBcvogkn2wHE26a1921DHapwmojyGce8=; b=DY1U3e1+fICZGHh9xLZfGVqERiIVtSK4cdXJYWYjRpNrr77CQ8nuNLbdD6NaH4kx+K UwPLflYF0Kcn8BpBPSHpBxHtL3jHxE2ArGgW4zw3KPuqT1ORDubmr8z4jFkz6m38Vnlg LkpXouVcBxVNyRFo8l+PIn54BXnjgic91MioeZbCH0SDUtbBOFUk7sFNPk4dztlaWzd1 0fvNtm/nX+Tlj838ZT9Sezs1ewOf+/t/7qIIhts31T/3wl/SOXcA3pO9dg59hUtTKYCS OsHjunevGGNiKOzp094LQJn4QLZpx6ztc28xeh+VdnMBcSbR8bB6g9UknIDlSmGDgNJk H6HA== X-Gm-Message-State: AOJu0Yzjr02H/HXxnNlPMw7m4edzpJDXjaIAuXHNnWka/ySvvJTUlHgi htDjoD8e6jvLbPAXfrkX9WPV4JW4EId3iTRbxWs= X-Received: by 2002:a05:6808:18a3:b0:3a6:febf:fb with SMTP id bi35-20020a05680818a300b003a6febf00fbmr4682069oib.22.1692381459383; Fri, 18 Aug 2023 10:57:39 -0700 (PDT) Received: from stoup.. ([2602:47:d483:7301:cf24:6daf:2b9e:7972]) by smtp.gmail.com with ESMTPSA id q11-20020a638c4b000000b005637030d00csm1838212pgn.30.2023.08.18.10.57.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:57:39 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: imp@bsdimp.com Subject: [PATCH 2/3] bsd-user: Remove image_info.mmap Date: Fri, 18 Aug 2023 10:57:35 -0700 Message-Id: <20230818175736.144194-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230818175736.144194-1-richard.henderson@linaro.org> References: <20230818175736.144194-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::236; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x236.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This value is unused. Signed-off-by: Richard Henderson --- bsd-user/qemu.h | 1 - bsd-user/elfload.c | 1 - 2 files changed, 2 deletions(-) diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 178114b423..898fe3e8b3 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -52,7 +52,6 @@ struct image_info { abi_ulong end_data; abi_ulong start_brk; abi_ulong brk; - abi_ulong mmap; abi_ulong rss; abi_ulong start_stack; abi_ulong entry; diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index 38a3439d2c..2d39e59258 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -738,7 +738,6 @@ int load_elf_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs, /* OK, This is the point of no return */ info->end_data = 0; info->end_code = 0; - info->mmap = 0; elf_entry = (abi_ulong) elf_ex.e_entry; /* XXX Join this with PT_INTERP search? */ From patchwork Fri Aug 18 17:57:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 714685 Delivered-To: patch@linaro.org Received: by 2002:a5d:484e:0:b0:317:ecd7:513f with SMTP id n14csp648251wrs; Fri, 18 Aug 2023 10:58:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEYbJVHP2byjB13e5hCfZi88WHhfVAVVejx5s0lZUj+cmuMYzDHD+wkNqRb/YzrIeUkJJJJ X-Received: by 2002:a05:6358:342a:b0:135:a10e:1ed0 with SMTP id h42-20020a056358342a00b00135a10e1ed0mr4278179rwd.23.1692381511361; Fri, 18 Aug 2023 10:58:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692381511; cv=none; d=google.com; s=arc-20160816; b=jK84bko3i4lXQUzRKz8lwJThOjRfZlT23KxXYOrH71xJXWF3PR1OfwzAbeQCsev3A4 rB9w5zVeVsH1/ceR3XdLOBZvz1M2AwFFABTJh4iQDOux/wVfqIot228giGsjygdPAjSY eh3NFvLdhibKiCfAaDS5ii7jnq5Wamv27/7qHMAhja7IkFxkPRMBWTw9H6njXsleukr7 k2N2sj2JlA9W9CkIktKvSMhOIXfKyCgspanpEjXKh43lfm87DsPF1ZX/jRv3BtpbMTWs kdiMkT6LjdWObOtb63tl9o/7aSUPzlK47p4ZF6dCIxmYoPrj8R39pCdmUUVKlRckIX8t vYbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mKC3oMtQdbEDSSpIBKgTNpz/jo9TrgS3VCqCg+QxX8s=; fh=IDR3SL6lwvblHJPJmbQ3/YzQ4jmMC8ZC3/QokybUV7g=; b=gEbtgzQz4Sl9B0zbrcERXElKiPAf6kWXiu80lSvRqU16ozRT2JKkwYtt6Un74rkRJf zm9khYQuZYq8lCTOPQjWZLS1gTsWMrypjjIjpW+jKzBJONXM8yIMHdabsxS2O6w84Ky0 JHKxVjEQjwJFQFoJC8J4hE//ULtF/j1CFlIBVgZMp7uWSWDS6QnCJgiAyPFby0Ml8BLt 3TPlW26gCCl10VrS4lyAOtYf0I0SWP4JVBIijWi0QIxcN+oqxzDxdW9IAYFH0jolxUyJ eYDPoqa6xkzReNR2WP7uKb682bas61p06uGDl496JZQUPk6yL5DhJ+DPhTrqA3ccb4to LpjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eFwCqPq+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h12-20020a0cf40c000000b0063d45cfdd7esi1635587qvl.92.2023.08.18.10.58.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Aug 2023 10:58:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eFwCqPq+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qX3jF-00011i-Gr; Fri, 18 Aug 2023 13:57:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qX3jD-00010Z-RH for qemu-devel@nongnu.org; Fri, 18 Aug 2023 13:57:43 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qX3jB-0004A0-Kj for qemu-devel@nongnu.org; Fri, 18 Aug 2023 13:57:43 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-688779ffcfdso1026003b3a.1 for ; Fri, 18 Aug 2023 10:57:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692381460; x=1692986260; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mKC3oMtQdbEDSSpIBKgTNpz/jo9TrgS3VCqCg+QxX8s=; b=eFwCqPq++9ffa6d4Dg3GFby4Y+Cy1mV1bndnrdoswjbMXllXOuwQJhJCYm4snSKHuc 1V+n/sYY68yG8R6xsOt7EOeeZBLXzxfmKAara6rk03aIpAIfYLofUKPsqu0tRfKnZouE tLGdQZ59vGIju5IoEbAauQYIndIldz65lQP+Q97A/FNUciA+DUoZxt/FcSwFWupUkMWo aXLe0GnGyBjdSTGymKAx65N7h6HZZTb2SWPKFt8AprGmdDmnNSmvuJH/7i+mI3gWDDCb 22lpL8Ap5lJgl6+irRSGkUqUTqDbOMzWvti/+aGlUMx4pfbdQmJZEZQ42ZUUJse3nr3Y 7phQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692381460; x=1692986260; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mKC3oMtQdbEDSSpIBKgTNpz/jo9TrgS3VCqCg+QxX8s=; b=fu3HCMuE1NQ/9Yfxe4DaUtKYvjwmA+eQhF64JzF5Zif2OlpbAT5I4pP2BK4l2gSlDx L0XEXkjdlP88wEZfW0f47j6TeQX5gxC5xCeszPtLASZKnUbf4eZTH4htxPnbeQItwVBd Uv+Gc+HioMOLJ9pNQpFEfePMAIiu18jA2LZZ5FyJJKMQxCe/kw19HelMPkkrOY5EXno1 ZoJ18b7IlbEaZnBdGpVFjXNhvFIMD1QRvLAgO/TgOQQBE1VvYM7Qt+4s9P5mytRANaTo T0d0Ka0BsIuHmClxyxV8D8j/cMI0EAGMA++D6Of5b38p8s5E6NKTH6wgWTnKO+GAO4xQ EOzQ== X-Gm-Message-State: AOJu0YwACcYAwkmO74j51BJtDEdu+g5IAD0RiGdSILB7rR85OI365V31 a5bRvRQGaq/ExG4OPjj8O/TokDQGFAJl9qxNJP8= X-Received: by 2002:a05:6a20:9146:b0:140:56b6:4137 with SMTP id x6-20020a056a20914600b0014056b64137mr4017369pzc.52.1692381460386; Fri, 18 Aug 2023 10:57:40 -0700 (PDT) Received: from stoup.. ([2602:47:d483:7301:cf24:6daf:2b9e:7972]) by smtp.gmail.com with ESMTPSA id q11-20020a638c4b000000b005637030d00csm1838212pgn.30.2023.08.18.10.57.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:57:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: imp@bsdimp.com Subject: [PATCH 3/3] bsd-user: Remove image_info.start_brk Date: Fri, 18 Aug 2023 10:57:36 -0700 Message-Id: <20230818175736.144194-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230818175736.144194-1-richard.henderson@linaro.org> References: <20230818175736.144194-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This has the same value is image_info.brk, which is also logged, and is otherwise unused. Signed-off-by: Richard Henderson Reviewed-by: Warner Losh --- bsd-user/qemu.h | 1 - bsd-user/elfload.c | 2 +- bsd-user/main.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 898fe3e8b3..61501c321b 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -50,7 +50,6 @@ struct image_info { abi_ulong end_code; abi_ulong start_data; abi_ulong end_data; - abi_ulong start_brk; abi_ulong brk; abi_ulong rss; abi_ulong start_stack; diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index 2d39e59258..baf2f63d2f 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -811,7 +811,7 @@ int load_elf_binary(struct bsd_binprm *bprm, struct target_pt_regs *regs, bprm->stringp, &elf_ex, load_addr, et_dyn_addr, interp_load_addr, info); info->load_addr = reloc_func_desc; - info->start_brk = info->brk = elf_brk; + info->brk = elf_brk; info->start_stack = bprm->p; info->load_bias = 0; diff --git a/bsd-user/main.c b/bsd-user/main.c index 381bb18df8..f913cb55a7 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -553,8 +553,6 @@ int main(int argc, char **argv) fprintf(f, "page layout changed following binary load\n"); page_dump(f); - fprintf(f, "start_brk 0x" TARGET_ABI_FMT_lx "\n", - info->start_brk); fprintf(f, "end_code 0x" TARGET_ABI_FMT_lx "\n", info->end_code); fprintf(f, "start_code 0x" TARGET_ABI_FMT_lx "\n",