From patchwork Fri Mar 17 15:54:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 664553 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp476215wrv; Fri, 17 Mar 2023 08:57:19 -0700 (PDT) X-Google-Smtp-Source: AK7set+XXB5HpSA+9YqZSqXlPg92PahO93xq123Z1UqSfVXFziDT2qcrudialSbTHza52bYVEPx5 X-Received: by 2002:ac8:5b87:0:b0:3b9:bcac:725b with SMTP id a7-20020ac85b87000000b003b9bcac725bmr14892070qta.22.1679068639323; Fri, 17 Mar 2023 08:57:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679068639; cv=none; d=google.com; s=arc-20160816; b=bZqqzz6l69IG4vPt9tDAhuulcN9esSVxVWfqmnfBFT9R8bDbM8xpTN8Ly+4tP4IIDR isnjKBTYC71EbRPArrpYViZZyDA9+5ut1FvpPqU5l+UXe1pfsEG+vaQHKjVM+ZiC7EGz TBQMYAIKZZ/9n9vZjHSe7YULQPzgf71/Bkqp4nP1yaQiEt2xm4ZUDWS93d4Vq/tclpKH rHV+yEKzrjJ+je+v+Esi9/CuwuCaKBN97bVzO+ygMFjYCzriZCVojrT7AzKGPYnd/LDZ /92UR4dT/hTXYwTkQ5OaQYaI5XMv0wWVvxmbdWKB5wW7+EqxMOXAkd0QSazM8cYTSaXm tyIA== 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=1Yi3XUo5Vyf7hVJ/JS7sYht8qm15aoRnWJkMV/b7vTc=; b=Bo/P+gqFjZqt9oR+MrWfqKnWiaaiQdGyqoCGdW1TT7ZqhZPhCahn07yEt8O3hKETcv frEllsNozVYbAJHGYAIGSea67TM4fP1+L3DApolLBfpsAqj7grKsAuQ9hcUu/qSJj5FJ BTdKYpJZKfzcy9avEddxq5fy7TDuFr9logy+NA2aiMzxoFU1+PdbbQaCI8bbzxw1/rmR 83hEY4ERwBRtL4j6HBt7NM0Hc7mg+i+KpiU2xfDiIhzJ+m+AytussQWow1FxuZlTlCbI dFglSsFJiqQmkzehMKeNLXbiLCGqSdc0mbcxTygGJlaPETT+K6CuQD91+twtSJHR/7n1 ob+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lYoiECYs; 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 x6-20020ac85f06000000b003c0405ae377si1593582qta.387.2023.03.17.08.57.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Mar 2023 08:57:19 -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=lYoiECYs; 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 1pdCQ7-0002lX-8d; Fri, 17 Mar 2023 11:55:07 -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 1pdCQ4-0002ki-RG for qemu-devel@nongnu.org; Fri, 17 Mar 2023 11:55:04 -0400 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pdCQ3-0007nN-3I for qemu-devel@nongnu.org; Fri, 17 Mar 2023 11:55:04 -0400 Received: by mail-pj1-x1036.google.com with SMTP id d13so5660538pjh.0 for ; Fri, 17 Mar 2023 08:55:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679068501; 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=1Yi3XUo5Vyf7hVJ/JS7sYht8qm15aoRnWJkMV/b7vTc=; b=lYoiECYsPP4RrlccSMV7O/YZ539XKgDMJwqThJttWV86Y52qxWIsoRY6/FAMruz7sX RPxIa+/8+N320KzecHUWO17pjWzjYCOKgs7jRW/6hDdxYqYryYmurYMvSkNOIRXD0nkD 7Y9NNw/nXoIypDJipltZ8v6z91vDYbsUgjc0J+YGqcnLpoIg/vqczbepMdXk5ovWH3+D swXQRXIH3dLPYqTPJNrXrJze0yyoS3bty92uXmMAcUFHsr3ITlrbq5IXUgGUZF9xxEMB I8/KV55piuM6Ms6SFQ6g37sIjP5l9VNs7Z0NwYQIEz3dnhEnZER1xb2NZccIyHWKb667 7ZlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679068501; 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=1Yi3XUo5Vyf7hVJ/JS7sYht8qm15aoRnWJkMV/b7vTc=; b=4o0QLSnOo+j3v6ESwz4XcmOP0M0aspUxcl5wN1eTwwIhABcGPmYaGzz7hkChUa7DFc 4jCosZarRQJE/O023MB5AfnuP9+Et3SVN/ttbNzG+Q3ik8BeiszBnPhhzjzG83XC5BxX iQkW8Aam6g/RHBPKLdYeKGWtW3baU9aUqqNMHIGVx8s5T3OMQPt+T58YlUabiOZnLjIj nP0DXoHp0nQym3Sk3YtEWQdfB17Xx8m6wVTqKa36RCpZUsFpgxdFJTjjIx4KZHhPlYsp NChtccCIZNlkdHmvep7fUxZizdnq7e7JYXgT6Yk/Bt3hrGYjXhJOMEeHKGillEYFes0S XeRA== X-Gm-Message-State: AO0yUKUf7H0LH2nGPT51rV01WfnC3//TIXMzhGkCFW2wHqXSFWGY78JM 0qx8zcnpPDvJrbd6w61JaKG3adwwZC1+tH5T+tU= X-Received: by 2002:a05:6a20:3b98:b0:d4:298b:8b8e with SMTP id b24-20020a056a203b9800b000d4298b8b8emr7697097pzh.33.1679068501311; Fri, 17 Mar 2023 08:55:01 -0700 (PDT) Received: from stoup.. (96-82-119-43-static.hfc.comcastbusiness.net. [96.82.119.43]) by smtp.gmail.com with ESMTPSA id s5-20020a656445000000b004fb3e5681cesm1668986pgv.20.2023.03.17.08.54.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 08:55:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/9] linux-user: Rename max_reserved_va in main Date: Fri, 17 Mar 2023 08:54:48 -0700 Message-Id: <20230317155455.341843-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230317155455.341843-1-richard.henderson@linaro.org> References: <20230317155455.341843-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1036; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1036.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 Rename to local_max_rva, to avoid a conflict with the next patch. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- linux-user/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 39d9bd4d7a..165fcb653e 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -680,7 +680,7 @@ int main(int argc, char **argv, char **envp) int i; int ret; int execfd; - unsigned long max_reserved_va; + unsigned long local_max_rva; bool preserve_argv0; error_init(argv[0]); @@ -791,7 +791,7 @@ int main(int argc, char **argv, char **envp) * still try it, if directed by the command-line option, but * not by default. */ - max_reserved_va = MAX_RESERVED_VA(cpu); + local_max_rva = MAX_RESERVED_VA(cpu); if (reserved_va != 0) { if (reserved_va % qemu_host_page_size) { char *s = size_to_str(qemu_host_page_size); @@ -799,7 +799,7 @@ int main(int argc, char **argv, char **envp) g_free(s); exit(EXIT_FAILURE); } - if (max_reserved_va && reserved_va > max_reserved_va) { + if (local_max_rva && reserved_va > local_max_rva) { fprintf(stderr, "Reserved virtual address too big\n"); exit(EXIT_FAILURE); } @@ -808,7 +808,7 @@ int main(int argc, char **argv, char **envp) * reserved_va must be aligned with the host page size * as it is used with mmap() */ - reserved_va = max_reserved_va & qemu_host_page_mask; + reserved_va = local_max_rva & qemu_host_page_mask; } {