From: Alistair Francis <alistair23@gmail.com>
To: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Cc: qemu-devel@nongnu.org, qemu-riscv@nongnu.org,
alistair.francis@wdc.com, bmeng@tinylab.org,
liweiwei@iscas.ac.cn, zhiwei_liu@linux.alibaba.com,
palmer@rivosinc.com, ajones@ventanamicro.com
Subject: Re: [PATCH v9 19/20] target/riscv/kvm.c: add kvmconfig_get_cfg_addr() helper
Date: Mon, 10 Jul 2023 12:33:08 +1000 [thread overview]
Message-ID: <CAKmqyKMdznN_oCLUhnQnga+5ertxby_rA+e0dSAyGoGoWKmLeQ@mail.gmail.com> (raw)
In-Reply-To: <20230706101738.460804-20-dbarboza@ventanamicro.com>
On Thu, Jul 6, 2023 at 8:19 PM Daniel Henrique Barboza
<dbarboza@ventanamicro.com> wrote:
>
> There are 2 places in which we need to get a pointer to a certain
> property of the cpu->cfg struct based on property offset. Next patch
> will add a couple more.
>
> Create a helper to avoid repeating this code over and over.
>
> Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
> Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> target/riscv/kvm.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/target/riscv/kvm.c b/target/riscv/kvm.c
> index ba940e570e..cfeab5a4c0 100644
> --- a/target/riscv/kvm.c
> +++ b/target/riscv/kvm.c
> @@ -215,11 +215,15 @@ static KVMCPUConfig kvm_multi_ext_cfgs[] = {
> KVM_EXT_CFG("svpbmt", ext_svpbmt, KVM_RISCV_ISA_EXT_SVPBMT),
> };
>
> +static void *kvmconfig_get_cfg_addr(RISCVCPU *cpu, KVMCPUConfig *kvmcfg)
> +{
> + return (void *)&cpu->cfg + kvmcfg->offset;
> +}
> +
> static void kvm_cpu_cfg_set(RISCVCPU *cpu, KVMCPUConfig *multi_ext,
> uint32_t val)
> {
> - int cpu_cfg_offset = multi_ext->offset;
> - bool *ext_enabled = (void *)&cpu->cfg + cpu_cfg_offset;
> + bool *ext_enabled = kvmconfig_get_cfg_addr(cpu, multi_ext);
>
> *ext_enabled = val;
> }
> @@ -227,8 +231,7 @@ static void kvm_cpu_cfg_set(RISCVCPU *cpu, KVMCPUConfig *multi_ext,
> static uint32_t kvm_cpu_cfg_get(RISCVCPU *cpu,
> KVMCPUConfig *multi_ext)
> {
> - int cpu_cfg_offset = multi_ext->offset;
> - bool *ext_enabled = (void *)&cpu->cfg + cpu_cfg_offset;
> + bool *ext_enabled = kvmconfig_get_cfg_addr(cpu, multi_ext);
>
> return *ext_enabled;
> }
> --
> 2.41.0
>
>
next prev parent reply other threads:[~2023-07-10 2:34 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-06 10:17 [PATCH v9 00/20] target/riscv, KVM: fixes and enhancements Daniel Henrique Barboza
2023-07-06 10:17 ` [PATCH v9 01/20] target/riscv: skip features setup for KVM CPUs Daniel Henrique Barboza
2023-07-10 1:26 ` Alistair Francis
2023-07-06 10:17 ` [PATCH v9 02/20] hw/riscv/virt.c: skip 'mmu-type' FDT if satp mode not set Daniel Henrique Barboza
2023-07-06 10:17 ` [PATCH v9 03/20] target/riscv/cpu.c: restrict 'mvendorid' value Daniel Henrique Barboza
2023-07-06 10:17 ` [PATCH v9 04/20] target/riscv/cpu.c: restrict 'mimpid' value Daniel Henrique Barboza
2023-07-06 10:17 ` [PATCH v9 05/20] target/riscv/cpu.c: restrict 'marchid' value Daniel Henrique Barboza
2023-07-06 10:17 ` [PATCH v9 06/20] target/riscv: use KVM scratch CPUs to init KVM properties Daniel Henrique Barboza
2023-07-06 10:17 ` [PATCH v9 07/20] target/riscv: read marchid/mimpid in kvm_riscv_init_machine_ids() Daniel Henrique Barboza
2023-07-06 10:17 ` [PATCH v9 08/20] target/riscv: handle mvendorid/marchid/mimpid for KVM CPUs Daniel Henrique Barboza
2023-07-06 10:17 ` [PATCH v9 09/20] linux-headers: Update to v6.4-rc1 Daniel Henrique Barboza
2023-07-06 10:17 ` [PATCH v9 10/20] target/riscv/kvm.c: init 'misa_ext_mask' with scratch CPU Daniel Henrique Barboza
2023-07-06 10:17 ` [PATCH v9 11/20] target/riscv/cpu: add misa_ext_info_arr[] Daniel Henrique Barboza
2023-07-10 1:33 ` Alistair Francis
2023-07-06 10:17 ` [PATCH v9 12/20] target/riscv: add KVM specific MISA properties Daniel Henrique Barboza
2023-07-10 2:16 ` Alistair Francis
2023-07-06 10:17 ` [PATCH v9 13/20] target/riscv/kvm.c: update KVM MISA bits Daniel Henrique Barboza
2023-07-10 2:23 ` Alistair Francis
2023-07-06 10:17 ` [PATCH v9 14/20] target/riscv/kvm.c: add multi-letter extension KVM properties Daniel Henrique Barboza
2023-07-06 12:14 ` Andrew Jones
2023-07-06 12:46 ` Daniel Henrique Barboza
2023-07-10 2:41 ` Alistair Francis
2023-07-10 2:40 ` Alistair Francis
2023-07-06 10:17 ` [PATCH v9 15/20] target/riscv/cpu.c: add satp_mode properties earlier Daniel Henrique Barboza
2023-07-10 2:23 ` Alistair Francis
2023-07-06 10:17 ` [PATCH v9 16/20] target/riscv/cpu.c: remove priv_ver check from riscv_isa_string_ext() Daniel Henrique Barboza
2023-07-10 2:24 ` Alistair Francis
2023-07-06 10:17 ` [PATCH v9 17/20] target/riscv/cpu.c: create KVM mock properties Daniel Henrique Barboza
2023-07-10 2:30 ` Alistair Francis
2023-07-06 10:17 ` [PATCH v9 18/20] target/riscv: update multi-letter extension KVM properties Daniel Henrique Barboza
2023-07-10 2:31 ` Alistair Francis
2023-07-06 10:17 ` [PATCH v9 19/20] target/riscv/kvm.c: add kvmconfig_get_cfg_addr() helper Daniel Henrique Barboza
2023-07-10 2:33 ` Alistair Francis [this message]
2023-07-06 10:17 ` [PATCH v9 20/20] target/riscv/kvm.c: read/write (cbom|cboz)_blocksize in KVM Daniel Henrique Barboza
2023-07-10 2:36 ` Alistair Francis
2023-07-10 2:48 ` [PATCH v9 00/20] target/riscv, KVM: fixes and enhancements Alistair Francis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAKmqyKMdznN_oCLUhnQnga+5ertxby_rA+e0dSAyGoGoWKmLeQ@mail.gmail.com \
--to=alistair23@gmail.com \
--cc=ajones@ventanamicro.com \
--cc=alistair.francis@wdc.com \
--cc=bmeng@tinylab.org \
--cc=dbarboza@ventanamicro.com \
--cc=liweiwei@iscas.ac.cn \
--cc=palmer@rivosinc.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=zhiwei_liu@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).