From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 27D11C624CF for ; Tue, 1 Sep 2026 09:56:45 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x1LAv-0007W4-Un; Tue, 01 Sep 2026 05:53:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1LAu-0007VN-Jb for qemu-arm@nongnu.org; Tue, 01 Sep 2026 05:53:04 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x1LAt-0007Sl-1h for qemu-arm@nongnu.org; Tue, 01 Sep 2026 05:53:04 -0400 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68179QDq1811482 for ; Tue, 1 Sep 2026 09:53:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= VTnZDkxqxcWE+Uhz4CNPQNK9aE/+Gp16fw+HxNLxbPo=; b=h0saezt2bNSgO1kD WAO94k6ogRLJXrirjIbXLBV+/fhgZ6nNNnO/q5eel7zmuVQFv0gfFmitmdM2I3DN fzkI1wwu8vjkioK//sDKR+KSyZ9I8d9bolzVJlHJX4B6hciKc85bq78nHEH1G4SJ L6nXKLYZ9NwjOWdmqCuLmos5wTniU36LRu7vtjiiSY3Z41FTB1PbzK0BLtaNysO4 17RrEYguMRSwemNSbDM2QQDYkcFV+es3Lt2bKHpiGN8QTUlx7/rh+uwQbB/p/99H 2lJSxFDxBwAjSf6wTcKcMYLiarSsRq8wcbYNbiWHfnEl1TUgLq7skG0tj4+HB27X 7zGI7A== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gdd4dv6ny-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 01 Sep 2026 09:53:02 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-9390ca1a9abso116020785a.2 for ; Tue, 01 Sep 2026 02:53:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788256381; x=1788861181; darn=nongnu.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=VTnZDkxqxcWE+Uhz4CNPQNK9aE/+Gp16fw+HxNLxbPo=; b=FxRo8CQusyIQ/FDaU1ciVAgBJugE9vRpFoFboQsdrdXw78Ve4eWAdRkZbbeM3QJ/KW gxmAxhSxo6jTCaejzuXjSmblxzuA4SToS4RNOnSQpjsKQGqUqVBWBG6OO6KWqvSFMyUE wn0Jr2H2g7CcKGR8ZQGH4YXZkXlhKrb6y7nO/IHsXgqzKW9VbgNNd+Q2fLy4zt5QJfrJ Vl8kp9COgkUZFDZ0Q8K/VpW2/q+CBbRYWi4ekx0Hw8ApsUQdZdVUPCUrHdGlYRv7z2WL frrH66vyPz1vyoegb1xJ8Le0BlxfTbJUl8x7LveNSJBt81gIwcoAW6UpQGAiDqq0FOKh vbIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788256381; x=1788861181; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=VTnZDkxqxcWE+Uhz4CNPQNK9aE/+Gp16fw+HxNLxbPo=; b=r7jkzs/SNWqGsvL+eUJEXkcb1XEwrXAyfPW37S6Z3clx3erFsCHYLqkrxKW16e1keq M7Mav7dqkYQL/D6R8vt9et7xlXFzX36fljThtpjs404LTjQsNpTB29IOMaeP2TUhWThL HNWi9duO1UanCmZdVT+WCFNB6V2lIcCvBTC/n0AbCKzGX2ws62sBnu7FGI+iXUsmqiRb dW0I7v7s38APFelcOsg13UmoDx7ZB3XJVPQutbEUbJ2NPYolPaZHG9KIe8HqlQFMFd0Z DNcwvueXma+MMaHsuHczDE9ZSki2ciGFbB6a+pxgIORB+hIu5nfCl5Z6C+Mq6/jiiFsR iNMQ== X-Forwarded-Encrypted: i=1; AHgh+Rq1IMNLtr/xINPzorFELqKWCL45PToGJDAWm2reLj5u3EbFh+IM5p+HZrH5r5hTU3KIFExyAm34yA==@nongnu.org X-Gm-Message-State: AFuF++lXUyyqyzkhd6HrStHPKr6YKtUyWsY4SxDtbqAbfZ4mB98fWvl0 eHCXrbRSHixqwkBwrll1z1VqZV5X2p69Mz/Md/WIBpOYs89n9bAa0mMrH6jhNAuEtiVTk+PxH/C K2atafyV4vHiG3Ru9AKgdDlW6qtFEDfj004OVp2ldRedhDYGw9i7lVJY= X-Gm-Gg: AR+sD12DlPQCI45jDxPH3FTWRmHIqEdnGGOwOxzUJiDGUXRey2SX0nVGI0b2+j+RZmb sW7G/JAGTqnpPrB8S1bUAzs5Rqb12KUw/x4F250zrjEwwp8GfJ5FTCSmFmLi+CkiBcrN699yDhl aheAaIbW14tLfwJDjQ29cV6H+RhnKrN0mKVFzAzduFCPZp/myQ1qws7MiF+eQrowmQ+fT3+utAP MPh4UjICTAbiozWCsIPlBc+V5AbKlPakcK8xiXBH8JsxWYcaCBNJ+tYotUjhkc5bR4cMTck9Ww/ GfSn2oKDORbWYEfJIOEc1PzK88hCrPAu3UI4d5F3i5Vn/YML4oubtSqugjEUorFfaloMXnkf2jH LurYfz7N87Fes/ox7YZVsg4KItiomB489l0cQ61cp X-Received: by 2002:a05:620a:19a7:b0:914:afc1:c66d with SMTP id af79cd13be357-939137f96demr3630170885a.11.1788256381379; Tue, 01 Sep 2026 02:53:01 -0700 (PDT) X-Received: by 2002:a05:620a:19a7:b0:914:afc1:c66d with SMTP id af79cd13be357-939137f96demr3630163685a.11.1788256380539; Tue, 01 Sep 2026 02:53:00 -0700 (PDT) Received: from localhost.localdomain (pmd666.hd.free.fr. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48442d6e9cfsm3992344f8f.22.2026.09.01.02.52.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 01 Sep 2026 02:52:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Zhao Liu , Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Helge Deller , Pierrick Bouvier Subject: [PATCH v5 04/21] linux-user: Replace env_cpu_const() by generic env_cpu() equivalent Date: Tue, 1 Sep 2026 11:52:10 +0200 Message-ID: <20260901095229.72018-5-philmd@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260901095229.72018-1-philmd@oss.qualcomm.com> References: <20260901095229.72018-1-philmd@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Authority-Analysis: v=2.4 cv=b9qCJNGx c=1 sm=1 tr=0 ts=6a96a07e cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=4s3hRJSeHn4rkQlkrse1kQ==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=M51BFTxLslgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=xWu8-Agft_6X_INOG6MA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAxMDA4NyBTYWx0ZWRfX5K6TdLmMI+d3 tyh6v2QmMuXRHfD/1JNqizhKDHvNqB2AZOM+JP50w/0xisvl9fI8SliMzY8ni+C686PSHJ8xl6R NN2/sKbMwUpW0tuvipbyYWIRYawE1AQbwVTJID4i9KM+NCi3/+Ilqy2z5rHiM90ccq8y2Te6rWK 9Bw3EfvIwml2FG/qE+VlFd1jx4+nFobGbmxknhYTxGVlHwrIIQnmgv0Kkt+H/Sl5fsyIsVvONLF LOotdJllxJQby8HQkQGXxO6khkMmArNTn2urgTfRjDaPdYe2Drk6/NBxROlCeNkOoSCR1vL647V kDiXtaLhvvmRa9DOkEeqKEj8I+7KbhoB+vetDUxcMVoJMJtgaDcvyJDd2fcH77VZoHBhd9Q2R4z CB/7+oxtE1DKeLJa/G081liWZlaXXPw/CDLzyL3qLxkxUNTbFT1OQSeSiRBj9qafeKJxIBbHiOK eLnl/pdfuKO3CtQlPLQ== X-Proofpoint-GUID: sfcRMCPWFHwMzcUweLT5hD6hVseVpYIb X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAxMDA4NyBTYWx0ZWRfXxvYNZbU/9fei vNbRl5IL9xf0NMhoPUYTqdlMM8Rt7N/YpCg2wwI2PEyD3ppZm8GPBWBUR9eEJ653q3zwnnB1r+M 64XEAMvgodiRWIdf7PzhNIWoaX31DoE= X-Proofpoint-ORIG-GUID: sfcRMCPWFHwMzcUweLT5hD6hVseVpYIb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-01_02,2026-08-31_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 phishscore=0 clxscore=1015 impostorscore=0 spamscore=0 priorityscore=1501 adultscore=0 suspectscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609010087 Received-SPF: pass client-ip=205.220.180.131; envelope-from=philmd@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 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_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_CSS_A=0.1 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Use the generic env_cpu() macro introduced in the previous commit and remove the few env_cpu_const() uses. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- include/exec/cpu-common.h | 1 - linux-user/elfload.c | 2 +- linux-user/i386/elfload.c | 2 +- linux-user/x86_64/elfload.c | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 60997628cc6..c14362f780d 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -102,6 +102,5 @@ static inline bool cpu_loop_exit_requested(const CPUState *cpu) (CPUState *)((void *)(env) - sizeof(CPUState)), \ const CPUArchState *: \ (const CPUState *)((const void *)(env) - sizeof(CPUState))) -#define env_cpu_const(cpu) env_cpu(cpu) #endif /* CPU_COMMON_H */ diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 88508deac50..c4bdaa146a7 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2128,7 +2128,7 @@ static int wmr_write_region(void *opaque, vaddr start, #endif static int elf_core_dump(int signr, const CPUArchState *env) { - const CPUState *cpu = env_cpu_const(env); + const CPUState *cpu = env_cpu(env); const TaskState *ts = (const TaskState *)get_task_state((CPUState *)cpu); struct rlimit dumpsize; CountAndSizeRegions css; diff --git a/linux-user/i386/elfload.c b/linux-user/i386/elfload.c index 26b12001a3e..2e10f38a412 100644 --- a/linux-user/i386/elfload.c +++ b/linux-user/i386/elfload.c @@ -38,7 +38,7 @@ void elf_core_copy_regs(target_elf_gregset_t *r, const CPUX86State *env) r->pt.es = tswapal(env->segs[R_ES].selector & 0xffff); r->pt.fs = tswapal(env->segs[R_FS].selector & 0xffff); r->pt.gs = tswapal(env->segs[R_GS].selector & 0xffff); - r->pt.orig_ax = tswapal(get_task_state(env_cpu_const(env))->orig_ax); + r->pt.orig_ax = tswapal(get_task_state(env_cpu(env))->orig_ax); r->pt.ip = tswapal(env->eip); r->pt.cs = tswapal(env->segs[R_CS].selector & 0xffff); r->pt.flags = tswapal(env->eflags); diff --git a/linux-user/x86_64/elfload.c b/linux-user/x86_64/elfload.c index 49a6f6180e0..121a8167acc 100644 --- a/linux-user/x86_64/elfload.c +++ b/linux-user/x86_64/elfload.c @@ -59,7 +59,7 @@ void elf_core_copy_regs(target_elf_gregset_t *r, const CPUX86State *env) r->pt.dx = tswapal(env->regs[R_EDX]); r->pt.si = tswapal(env->regs[R_ESI]); r->pt.di = tswapal(env->regs[R_EDI]); - r->pt.orig_ax = tswapal(get_task_state(env_cpu_const(env))->orig_ax); + r->pt.orig_ax = tswapal(get_task_state(env_cpu(env))->orig_ax); r->pt.ip = tswapal(env->eip); r->pt.cs = tswapal(env->segs[R_CS].selector & 0xffff); r->pt.flags = tswapal(env->eflags); -- 2.53.0