Hi Palmer, On Thu, Mar 2, 2023 at 10:08 AM Palmer Dabbelt <pal...@rivosinc.com> wrote: > > On Fri, 24 Feb 2023 09:45:16 PST (-0800), dbarb...@ventanamicro.com wrote: > > Hi, > > > > These cleanups were suggested by LIU Zhiwei during the review of the > > RISCV_FEATURE_* cleanups, currently on version 7 [1]. > > > > These are dependent on the patch "[PATCH v7 01/10] target/riscv: introduce > > riscv_cpu_cfg()" from [1] because we use the riscv_cpu_cfg() API. > > > > > > [1] https://lists.gnu.org/archive/html/qemu-devel/2023-02/msg06467.html > > > > Daniel Henrique Barboza (4): > > target/riscv/csr.c: use env_archcpu() in ctr() > > target/riscv/csr.c: simplify mctr() > > target/riscv/csr.c: use riscv_cpu_cfg() to avoid env_cpu() pointers > > target/riscv/csr.c: avoid env_archcpu() usages when reading > > RISCVCPUConfig > > > > target/riscv/csr.c | 90 +++++++++++++--------------------------------- > > 1 file changed, 24 insertions(+), 66 deletions(-) > > I just based these on that patch, which landed as d4ea711704 > ("target/riscv: introduce riscv_cpu_cfg()"). That resulted in a handful > of merge conflicts, but everything looked pretty mechanical. So it's > queued up. >
As Weiwei pointed out in https://lore.kernel.org/qemu-devel/e40e75ff-37e0-94d3-e9e2-c159b0e2d...@iscas.ac.cn/, patch#1 should be dropped. But I see it was landed up in your tree @ https://github.com/palmer-dabbelt/qemu/commit/3c7d54f945f1b5b474ea35c0815a1618927c9384, while my changes are already in tree @ https://github.com/palmer-dabbelt/qemu/commit/94e297071bc0a5965cc32c497a886f2cf9d32710. Not sure why git doesn't figure that out ... Regards, Bin