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, philmd@linaro.org, ajones@ventanamicro.com
Subject: Re: [PATCH v3 06/19] target/riscv: move 'host' CPU declaration to kvm.c
Date: Fri, 22 Sep 2023 15:53:27 +1000 [thread overview]
Message-ID: <CAKmqyKNno9PPvpez_Mk_hH_UzWQMiThH7RMnpG6L25c5L3vG6Q@mail.gmail.com> (raw)
In-Reply-To: <20230920112020.651006-7-dbarboza@ventanamicro.com>
On Wed, Sep 20, 2023 at 9:22 PM Daniel Henrique Barboza
<dbarboza@ventanamicro.com> wrote:
>
> This CPU only exists if we're compiling with KVM so move it to the kvm
> specific file.
>
> Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
> Reviewed-by: LIU Zhiwei <zhiwei_liu@linux.alibaba.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> target/riscv/cpu.c | 15 ---------------
> target/riscv/kvm.c | 21 +++++++++++++++++++++
> 2 files changed, 21 insertions(+), 15 deletions(-)
>
> diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
> index 848b58e7c4..f8368ce274 100644
> --- a/target/riscv/cpu.c
> +++ b/target/riscv/cpu.c
> @@ -652,18 +652,6 @@ static void rv32_imafcu_nommu_cpu_init(Object *obj)
> }
> #endif
>
> -#if defined(CONFIG_KVM)
> -static void riscv_host_cpu_init(Object *obj)
> -{
> - CPURISCVState *env = &RISCV_CPU(obj)->env;
> -#if defined(TARGET_RISCV32)
> - set_misa(env, MXL_RV32, 0);
> -#elif defined(TARGET_RISCV64)
> - set_misa(env, MXL_RV64, 0);
> -#endif
> -}
> -#endif /* CONFIG_KVM */
> -
> static ObjectClass *riscv_cpu_class_by_name(const char *cpu_model)
> {
> ObjectClass *oc;
> @@ -2041,9 +2029,6 @@ static const TypeInfo riscv_cpu_type_infos[] = {
> },
> DEFINE_DYNAMIC_CPU(TYPE_RISCV_CPU_ANY, riscv_any_cpu_init),
> DEFINE_DYNAMIC_CPU(TYPE_RISCV_CPU_MAX, riscv_max_cpu_init),
> -#if defined(CONFIG_KVM)
> - DEFINE_CPU(TYPE_RISCV_CPU_HOST, riscv_host_cpu_init),
> -#endif
> #if defined(TARGET_RISCV32)
> DEFINE_DYNAMIC_CPU(TYPE_RISCV_CPU_BASE32, rv32_base_cpu_init),
> DEFINE_CPU(TYPE_RISCV_CPU_IBEX, rv32_ibex_cpu_init),
> diff --git a/target/riscv/kvm.c b/target/riscv/kvm.c
> index 1e4e4456b3..31d2ede4b6 100644
> --- a/target/riscv/kvm.c
> +++ b/target/riscv/kvm.c
> @@ -1271,3 +1271,24 @@ void kvm_riscv_aia_create(MachineState *machine, uint64_t group_shift,
>
> kvm_msi_via_irqfd_allowed = kvm_irqfds_enabled();
> }
> +
> +static void riscv_host_cpu_init(Object *obj)
> +{
> + CPURISCVState *env = &RISCV_CPU(obj)->env;
> +
> +#if defined(TARGET_RISCV32)
> + env->misa_mxl_max = env->misa_mxl = MXL_RV32;
> +#elif defined(TARGET_RISCV64)
> + env->misa_mxl_max = env->misa_mxl = MXL_RV64;
> +#endif
> +}
> +
> +static const TypeInfo riscv_kvm_cpu_type_infos[] = {
> + {
> + .name = TYPE_RISCV_CPU_HOST,
> + .parent = TYPE_RISCV_CPU,
> + .instance_init = riscv_host_cpu_init,
> + }
> +};
> +
> +DEFINE_TYPES(riscv_kvm_cpu_type_infos)
> --
> 2.41.0
>
>
next prev parent reply other threads:[~2023-09-22 5:54 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-20 11:20 [PATCH v3 00/19] riscv: split TCG/KVM accelerators from cpu.c Daniel Henrique Barboza
2023-09-20 11:20 ` [PATCH v3 01/19] target/riscv: introduce TCG AccelCPUClass Daniel Henrique Barboza
2023-09-22 5:24 ` Alistair Francis
2023-09-20 11:20 ` [PATCH v3 02/19] target/riscv: move riscv_cpu_realize_tcg() to TCG::cpu_realizefn() Daniel Henrique Barboza
2023-09-22 5:29 ` Alistair Francis
2023-09-25 9:17 ` Daniel Henrique Barboza
2023-09-25 10:33 ` Alistair Francis
2023-09-20 11:20 ` [PATCH v3 03/19] target/riscv: move riscv_cpu_validate_set_extensions() to tcg-cpu.c Daniel Henrique Barboza
2023-09-22 5:32 ` Alistair Francis
2023-09-20 11:20 ` [PATCH v3 04/19] target/riscv: move riscv_tcg_ops " Daniel Henrique Barboza
2023-09-22 5:34 ` Alistair Francis
2023-09-20 11:20 ` [PATCH v3 05/19] target/riscv/cpu.c: add .instance_post_init() Daniel Henrique Barboza
2023-09-22 5:51 ` Alistair Francis
2023-09-20 11:20 ` [PATCH v3 06/19] target/riscv: move 'host' CPU declaration to kvm.c Daniel Henrique Barboza
2023-09-22 5:53 ` Alistair Francis [this message]
2023-09-20 11:20 ` [PATCH v3 07/19] target/riscv/cpu.c: mark extensions arrays as 'const' Daniel Henrique Barboza
2023-09-22 5:54 ` Alistair Francis
2023-09-20 11:20 ` [PATCH v3 08/19] target/riscv: move riscv_cpu_add_kvm_properties() to kvm.c Daniel Henrique Barboza
2023-09-22 5:55 ` Alistair Francis
2023-09-20 11:20 ` [PATCH v3 09/19] target/riscv: make riscv_add_satp_mode_properties() public Daniel Henrique Barboza
2023-09-22 6:03 ` Alistair Francis
2023-09-20 11:20 ` [PATCH v3 10/19] target/riscv: remove kvm-stub.c Daniel Henrique Barboza
2023-09-22 6:06 ` Alistair Francis
2023-09-20 11:20 ` [PATCH v3 11/19] target/riscv: introduce KVM AccelCPUClass Daniel Henrique Barboza
2023-09-22 6:08 ` Alistair Francis
2023-09-20 11:20 ` [PATCH v3 12/19] target/riscv: move KVM only files to kvm subdir Daniel Henrique Barboza
2023-09-25 1:26 ` Alistair Francis
2023-09-20 11:20 ` [PATCH v3 13/19] target/riscv/kvm: do not use riscv_cpu_add_misa_properties() Daniel Henrique Barboza
2023-09-25 1:32 ` Alistair Francis
2023-09-20 11:20 ` [PATCH v3 14/19] target/riscv/cpu.c: export set_misa() Daniel Henrique Barboza
2023-09-25 1:36 ` Alistair Francis
2023-09-20 11:20 ` [PATCH v3 15/19] target/riscv/tcg: introduce tcg_cpu_instance_init() Daniel Henrique Barboza
2023-09-25 1:56 ` Alistair Francis
2023-09-20 11:20 ` [PATCH v3 16/19] target/riscv/cpu.c: make misa_ext_cfgs[] 'const' Daniel Henrique Barboza
2023-09-25 1:37 ` Alistair Francis
2023-09-20 11:20 ` [PATCH v3 17/19] target/riscv/tcg: move riscv_cpu_add_misa_properties() to tcg-cpu.c Daniel Henrique Barboza
2023-09-25 1:57 ` Alistair Francis
2023-09-20 11:20 ` [PATCH v3 18/19] target/riscv/cpu.c: export isa_edata_arr[] Daniel Henrique Barboza
2023-09-25 2:00 ` Alistair Francis
2023-09-20 11:20 ` [PATCH v3 19/19] target/riscv/cpu: move priv spec functions to tcg-cpu.c Daniel Henrique Barboza
2023-09-22 10:55 ` Philippe Mathieu-Daudé
2023-09-25 2:00 ` Alistair Francis
2023-09-25 3:30 ` [PATCH v3 00/19] riscv: split TCG/KVM accelerators from cpu.c 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=CAKmqyKNno9PPvpez_Mk_hH_UzWQMiThH7RMnpG6L25c5L3vG6Q@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=philmd@linaro.org \
--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).