From nobody Tue Feb 10 19:09:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1614896623; cv=none; d=zohomail.com; s=zohoarc; b=EUAL72uj16XWTH+AlkMTsv5IpoL9vqPJNfCji1DqL13i52u3Y2soG50oM3g6CKBtWBo/7MveKIRIaC+A4k/t00UYMJAxZVpDBA42ZE4Lrs/6nvI3ayzlJO9x3KKUvkSCP5R1n12R7g6A+t0Myl9OIXlD7MgAQZZyBJ6qAb1xWxA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614896623; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Sy2H6EddRIKWB1GSb3aR2E61qw1Oji422a4IED5nUFk=; b=ItbtNbNl3r7zJ7yoFk/d/DfLJj1Dq1MiN7NR/nHVXc6DtJhpECb3qxmC+ERAbt38zReS87FODOWTQMICcifctjRtc1Mh41u+MUMp1Z0VdxU/5djYGbjtt6toHPuevQ+UeJcn6liN85nD8eDaOmREFtRvS+3yC3VYCJfyzAwmZIU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1614896622998915.8448852318055; Thu, 4 Mar 2021 14:23:42 -0800 (PST) Received: by mail-wr1-f45.google.com with SMTP id a18so21168372wrc.13 for ; Thu, 04 Mar 2021 14:23:42 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id y9sm907051wrm.88.2021.03.04.14.23.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Mar 2021 14:23:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Sy2H6EddRIKWB1GSb3aR2E61qw1Oji422a4IED5nUFk=; b=mhBQEJUjEnB/YIfFNMe++iCNWz0lJM5t4I45IW7gGw6pz4iPRjTY1kAOLOwqDZL7ot Wx6nDJEaMvdheasiN9HYKocpqofzOsYa6I9yN1m8YReMdvKynY8+wujDG65Dj6IX098p k6JYfFDivampkjG3tsfEA1KmoNyGSfrG/M8MigxnAEPnhKwY4+/zP1jjPXo7acXe4AYA TOwZP3ZM17VgTe1jvAEzCBdzewFmVfSuRLmAClJ3jCN6LTWOnBm1hmpgbip1RqQ0BYyP xBrgN+hVJKOAwXYAwIDNGgunDGyGfP/KSz6SAnwFUq9yzlHIYY38BES3bHNHoQAUNUie JDhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Sy2H6EddRIKWB1GSb3aR2E61qw1Oji422a4IED5nUFk=; b=nsX95dB+t+KMl/MAIoRpYtG8ABa5XGEtv0clsFFwjwrG4ExpYtwUsITKxbY2rLXt0D bR3kDVXDcMXrrTCIOAPs10bvLc2rjdPeumQT/BfQ8mdo5WJdncicwsHvWRAHu8AaxYSi qtStqx3ry8iZMdagQXxZD6UxYf5BuUo4/rjDl0wKoUyioVzTBsVWLnUtkplIiBVObHBU MoGXyzK7fuX5jFVVgob7poj4kTFQQ2PM7kUUmobG5l2RdWgyIJn7ZMB8r0vQaoPslcZD lcNBEYkH9nUlPlYGacZIp1T7gITgQJVGgVIXmOOPZNPlS//veh39NPMu9j6jO6RI7KhL tZBw== X-Gm-Message-State: AOAM532ekettb/sE77Ylv62Jbla7+e9eqS4FX/Dh2NPFKIPRjDKq0zK7 HCHV6fdFJuTcTaOnLWRk2d0= X-Google-Smtp-Source: ABdhPJwlQm7jfaSajGyc50qshmJurkslHzterzoVGYe4xgchSIPRbdA//wesm2yYXPzLC2j1BiGmUg== X-Received: by 2002:adf:ed49:: with SMTP id u9mr6088176wro.337.1614896621247; Thu, 04 Mar 2021 14:23:41 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: David Hildenbrand , David Gibson , qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, Thomas Huth , Laurent Vivier , Cornelia Huck , Greg Kurz , Paolo Bonzini , qemu-arm@nongnu.org, Eduardo Habkost , Peter Maydell , Richard Henderson , qemu-riscv@nongnu.org, Claudio Fontana , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 3/8] target/arm: Directly use arm_cpu_has_work instead of CPUClass::has_work Date: Thu, 4 Mar 2021 23:23:18 +0100 Message-Id: <20210304222323.1954755-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210304222323.1954755-1-f4bug@amsat.org> References: <20210304222323.1954755-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) There is only one CPUClass::has_work() ARM handler: arm_cpu_has_work(). Avoid a dereference by declaring it in "internals.h" and call it directly in the WFI helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Claudio Fontana --- target/arm/internals.h | 1 + target/arm/cpu.c | 2 +- target/arm/op_helper.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 05cebc8597c..1930be08828 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -172,6 +172,7 @@ static inline int r14_bank_number(int mode) void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu); void arm_translate_init(void); =20 +bool arm_cpu_has_work(CPUState *cs); #ifdef CONFIG_TCG void arm_cpu_synchronize_from_tb(CPUState *cs, const TranslationBlock *tb); #endif /* CONFIG_TCG */ diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 5e018b2a732..6d2d9f2100f 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -76,7 +76,7 @@ void arm_cpu_synchronize_from_tb(CPUState *cs, } #endif /* CONFIG_TCG */ =20 -static bool arm_cpu_has_work(CPUState *cs) +bool arm_cpu_has_work(CPUState *cs) { ARMCPU *cpu =3D ARM_CPU(cs); =20 diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c index 65cb37d088f..a4da6f4fde8 100644 --- a/target/arm/op_helper.c +++ b/target/arm/op_helper.c @@ -289,7 +289,7 @@ void HELPER(wfi)(CPUARMState *env, uint32_t insn_len) CPUState *cs =3D env_cpu(env); int target_el =3D check_wfx_trap(env, false); =20 - if (cpu_has_work(cs)) { + if (arm_cpu_has_work(cs)) { /* Don't bother to go into our "low power state" if * we would just wake up immediately. */ --=20 2.26.2