| Message ID | 20210205225650.1330794-39-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | tcg patch queue | expand |
On 2/5/21 11:56 PM, Richard Henderson wrote: > From: Claudio Fontana <cfontana@suse.de> > > Signed-off-by: Claudio Fontana <cfontana@suse.de> > Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > > [claudio: wrap target code around CONFIG_TCG and !CONFIG_USER_ONLY] > > avoiding its use in headers used by common_ss code (should be poisoned). > > Note: need to be careful with the use of CONFIG_USER_ONLY, > Message-Id: <20210204163931.7358-11-cfontana@suse.de> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > include/hw/core/cpu.h | 28 +++++++++++++--------------- > hw/mips/jazz.c | 9 +++++++-- > target/alpha/cpu.c | 2 +- > target/arm/cpu.c | 4 ++-- > target/m68k/cpu.c | 2 +- > target/microblaze/cpu.c | 2 +- > target/mips/cpu.c | 4 +++- > target/riscv/cpu.c | 2 +- > target/riscv/cpu_helper.c | 2 +- > target/sparc/cpu.c | 2 +- > target/xtensa/cpu.c | 2 +- > target/xtensa/helper.c | 4 ++-- > 12 files changed, 34 insertions(+), 29 deletions(-) > > diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h > index 60cf20bf05..41ce1daefc 100644 > --- a/include/hw/core/cpu.h > +++ b/include/hw/core/cpu.h > @@ -122,6 +122,14 @@ typedef struct TcgCpuOperations { > /** @debug_excp_handler: Callback for handling debug exceptions */ > void (*debug_excp_handler)(CPUState *cpu); > > + /** > + * @do_transaction_failed: Callback for handling failed memory transactions > + * (ie bus faults or external aborts; not MMU faults) > + */ > + void (*do_transaction_failed)(CPUState *cpu, hwaddr physaddr, vaddr addr, > + unsigned size, MMUAccessType access_type, > + int mmu_idx, MemTxAttrs attrs, > + MemTxResult response, uintptr_t retaddr); > } TcgCpuOperations; > > /** > @@ -133,8 +141,6 @@ typedef struct TcgCpuOperations { > * @has_work: Callback for checking if there is work to do. > * @do_unaligned_access: Callback for unaligned access handling, if > * the target defines #TARGET_ALIGNED_ONLY. > - * @do_transaction_failed: Callback for handling failed memory transactions > - * (ie bus faults or external aborts; not MMU faults) > * @virtio_is_big_endian: Callback to return %true if a CPU which supports > * runtime configurable endianness is currently big-endian. Non-configurable > * CPUs can use the default implementation of this method. This method should > @@ -203,10 +209,6 @@ struct CPUClass { > void (*do_unaligned_access)(CPUState *cpu, vaddr addr, > MMUAccessType access_type, > int mmu_idx, uintptr_t retaddr); > - void (*do_transaction_failed)(CPUState *cpu, hwaddr physaddr, vaddr addr, > - unsigned size, MMUAccessType access_type, > - int mmu_idx, MemTxAttrs attrs, > - MemTxResult response, uintptr_t retaddr); > bool (*virtio_is_big_endian)(CPUState *cpu); > int (*memory_rw_debug)(CPUState *cpu, vaddr addr, > uint8_t *buf, int len, bool is_write); > @@ -879,9 +881,6 @@ CPUState *cpu_by_arch_id(int64_t id); > > void cpu_interrupt(CPUState *cpu, int mask); > > -#ifdef NEED_CPU_H > - > -#ifdef CONFIG_SOFTMMU > static inline void cpu_unaligned_access(CPUState *cpu, vaddr addr, > MMUAccessType access_type, > int mmu_idx, uintptr_t retaddr) > @@ -900,14 +899,13 @@ static inline void cpu_transaction_failed(CPUState *cpu, hwaddr physaddr, > { > CPUClass *cc = CPU_GET_CLASS(cpu); > > - if (!cpu->ignore_memory_transaction_failures && cc->do_transaction_failed) { > - cc->do_transaction_failed(cpu, physaddr, addr, size, access_type, > - mmu_idx, attrs, response, retaddr); > + if (!cpu->ignore_memory_transaction_failures && > + cc->tcg_ops.do_transaction_failed) { > + cc->tcg_ops.do_transaction_failed(cpu, physaddr, addr, size, > + access_type, mmu_idx, attrs, > + response, retaddr); > } > } > -#endif > - > -#endif /* NEED_CPU_H */ > > /** > * cpu_set_pc: > diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c > index f9442731dd..46c71a0ac8 100644 > --- a/hw/mips/jazz.c > +++ b/hw/mips/jazz.c > @@ -116,6 +116,8 @@ static const MemoryRegionOps dma_dummy_ops = { > #define MAGNUM_BIOS_SIZE_MAX 0x7e000 > #define MAGNUM_BIOS_SIZE \ > (BIOS_SIZE < MAGNUM_BIOS_SIZE_MAX ? BIOS_SIZE : MAGNUM_BIOS_SIZE_MAX) > + > +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) > static void (*real_do_transaction_failed)(CPUState *cpu, hwaddr physaddr, > vaddr addr, unsigned size, > MMUAccessType access_type, > @@ -137,6 +139,7 @@ static void mips_jazz_do_transaction_failed(CPUState *cs, hwaddr physaddr, > (*real_do_transaction_failed)(cs, physaddr, addr, size, access_type, > mmu_idx, attrs, response, retaddr); > } > +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ > > static void mips_jazz_init(MachineState *machine, > enum jazz_model_e jazz_model) > @@ -205,8 +208,10 @@ static void mips_jazz_init(MachineState *machine, > * memory region that catches all memory accesses, as we do on Malta. > */ > cc = CPU_GET_CLASS(cpu); > - real_do_transaction_failed = cc->do_transaction_failed; > - cc->do_transaction_failed = mips_jazz_do_transaction_failed; > +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) > + real_do_transaction_failed = cc->tcg_ops.do_transaction_failed; > + cc->tcg_ops.do_transaction_failed = mips_jazz_do_transaction_failed; > +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ Why CONFIG_USER_ONLY isn't poisoned under hw/ ?
On 2/23/21 10:43 PM, Philippe Mathieu-Daudé wrote: > On 2/5/21 11:56 PM, Richard Henderson wrote: >> From: Claudio Fontana <cfontana@suse.de> >> >> Signed-off-by: Claudio Fontana <cfontana@suse.de> >> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> >> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> >> >> [claudio: wrap target code around CONFIG_TCG and !CONFIG_USER_ONLY] >> >> avoiding its use in headers used by common_ss code (should be poisoned). >> >> Note: need to be careful with the use of CONFIG_USER_ONLY, >> Message-Id: <20210204163931.7358-11-cfontana@suse.de> >> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> >> --- >> include/hw/core/cpu.h | 28 +++++++++++++--------------- >> hw/mips/jazz.c | 9 +++++++-- >> target/alpha/cpu.c | 2 +- >> target/arm/cpu.c | 4 ++-- >> target/m68k/cpu.c | 2 +- >> target/microblaze/cpu.c | 2 +- >> target/mips/cpu.c | 4 +++- >> target/riscv/cpu.c | 2 +- >> target/riscv/cpu_helper.c | 2 +- >> target/sparc/cpu.c | 2 +- >> target/xtensa/cpu.c | 2 +- >> target/xtensa/helper.c | 4 ++-- >> 12 files changed, 34 insertions(+), 29 deletions(-) >> >> diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h >> index 60cf20bf05..41ce1daefc 100644 >> --- a/include/hw/core/cpu.h >> +++ b/include/hw/core/cpu.h >> @@ -122,6 +122,14 @@ typedef struct TcgCpuOperations { >> /** @debug_excp_handler: Callback for handling debug exceptions */ >> void (*debug_excp_handler)(CPUState *cpu); >> >> + /** >> + * @do_transaction_failed: Callback for handling failed memory transactions >> + * (ie bus faults or external aborts; not MMU faults) >> + */ >> + void (*do_transaction_failed)(CPUState *cpu, hwaddr physaddr, vaddr addr, >> + unsigned size, MMUAccessType access_type, >> + int mmu_idx, MemTxAttrs attrs, >> + MemTxResult response, uintptr_t retaddr); >> } TcgCpuOperations; >> >> /** >> @@ -133,8 +141,6 @@ typedef struct TcgCpuOperations { >> * @has_work: Callback for checking if there is work to do. >> * @do_unaligned_access: Callback for unaligned access handling, if >> * the target defines #TARGET_ALIGNED_ONLY. >> - * @do_transaction_failed: Callback for handling failed memory transactions >> - * (ie bus faults or external aborts; not MMU faults) >> * @virtio_is_big_endian: Callback to return %true if a CPU which supports >> * runtime configurable endianness is currently big-endian. Non-configurable >> * CPUs can use the default implementation of this method. This method should >> @@ -203,10 +209,6 @@ struct CPUClass { >> void (*do_unaligned_access)(CPUState *cpu, vaddr addr, >> MMUAccessType access_type, >> int mmu_idx, uintptr_t retaddr); >> - void (*do_transaction_failed)(CPUState *cpu, hwaddr physaddr, vaddr addr, >> - unsigned size, MMUAccessType access_type, >> - int mmu_idx, MemTxAttrs attrs, >> - MemTxResult response, uintptr_t retaddr); >> bool (*virtio_is_big_endian)(CPUState *cpu); >> int (*memory_rw_debug)(CPUState *cpu, vaddr addr, >> uint8_t *buf, int len, bool is_write); >> @@ -879,9 +881,6 @@ CPUState *cpu_by_arch_id(int64_t id); >> >> void cpu_interrupt(CPUState *cpu, int mask); >> >> -#ifdef NEED_CPU_H >> - >> -#ifdef CONFIG_SOFTMMU >> static inline void cpu_unaligned_access(CPUState *cpu, vaddr addr, >> MMUAccessType access_type, >> int mmu_idx, uintptr_t retaddr) >> @@ -900,14 +899,13 @@ static inline void cpu_transaction_failed(CPUState *cpu, hwaddr physaddr, >> { >> CPUClass *cc = CPU_GET_CLASS(cpu); >> >> - if (!cpu->ignore_memory_transaction_failures && cc->do_transaction_failed) { >> - cc->do_transaction_failed(cpu, physaddr, addr, size, access_type, >> - mmu_idx, attrs, response, retaddr); >> + if (!cpu->ignore_memory_transaction_failures && >> + cc->tcg_ops.do_transaction_failed) { >> + cc->tcg_ops.do_transaction_failed(cpu, physaddr, addr, size, >> + access_type, mmu_idx, attrs, >> + response, retaddr); >> } >> } >> -#endif >> - >> -#endif /* NEED_CPU_H */ >> >> /** >> * cpu_set_pc: >> diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c >> index f9442731dd..46c71a0ac8 100644 >> --- a/hw/mips/jazz.c >> +++ b/hw/mips/jazz.c >> @@ -116,6 +116,8 @@ static const MemoryRegionOps dma_dummy_ops = { >> #define MAGNUM_BIOS_SIZE_MAX 0x7e000 >> #define MAGNUM_BIOS_SIZE \ >> (BIOS_SIZE < MAGNUM_BIOS_SIZE_MAX ? BIOS_SIZE : MAGNUM_BIOS_SIZE_MAX) >> + >> +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) >> static void (*real_do_transaction_failed)(CPUState *cpu, hwaddr physaddr, >> vaddr addr, unsigned size, >> MMUAccessType access_type, >> @@ -137,6 +139,7 @@ static void mips_jazz_do_transaction_failed(CPUState *cs, hwaddr physaddr, >> (*real_do_transaction_failed)(cs, physaddr, addr, size, access_type, >> mmu_idx, attrs, response, retaddr); >> } >> +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ >> >> static void mips_jazz_init(MachineState *machine, >> enum jazz_model_e jazz_model) >> @@ -205,8 +208,10 @@ static void mips_jazz_init(MachineState *machine, >> * memory region that catches all memory accesses, as we do on Malta. >> */ >> cc = CPU_GET_CLASS(cpu); >> - real_do_transaction_failed = cc->do_transaction_failed; >> - cc->do_transaction_failed = mips_jazz_do_transaction_failed; >> +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) >> + real_do_transaction_failed = cc->tcg_ops.do_transaction_failed; >> + cc->tcg_ops.do_transaction_failed = mips_jazz_do_transaction_failed; >> +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ > > Why CONFIG_USER_ONLY isn't poisoned under hw/ ? > As I can see, hw/ contains a wide variety of objects, which go into hw_arch, specific, softmmu or common. There does not seem to be a common way to handle objects in hw/ . In the case of hw/mips, it goes to hw_arch in meson.build, so it sees config target. Other users of CONFIG_USER_ONLY in hw/ are arm semihosting: semihosting/arm-compat-semi.c which goes to specific_ss and hw/cpu.c, which uses CONFIG_USER_ONLY but does not see it, since it is a common_ss module. So the uses of CONFIG_USER_ONLY in hw/cpu.c are wrong for sure, or at least until hw/cpu.c goes to common_ss. It does not hurt because the tests are in the negative, and those sysemu-only / softmmu-only symbols are actually always visible, including for CONFIG_USER_ONLY. Ciao, Claudio
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 60cf20bf05..41ce1daefc 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -122,6 +122,14 @@ typedef struct TcgCpuOperations { /** @debug_excp_handler: Callback for handling debug exceptions */ void (*debug_excp_handler)(CPUState *cpu); + /** + * @do_transaction_failed: Callback for handling failed memory transactions + * (ie bus faults or external aborts; not MMU faults) + */ + void (*do_transaction_failed)(CPUState *cpu, hwaddr physaddr, vaddr addr, + unsigned size, MMUAccessType access_type, + int mmu_idx, MemTxAttrs attrs, + MemTxResult response, uintptr_t retaddr); } TcgCpuOperations; /** @@ -133,8 +141,6 @@ typedef struct TcgCpuOperations { * @has_work: Callback for checking if there is work to do. * @do_unaligned_access: Callback for unaligned access handling, if * the target defines #TARGET_ALIGNED_ONLY. - * @do_transaction_failed: Callback for handling failed memory transactions - * (ie bus faults or external aborts; not MMU faults) * @virtio_is_big_endian: Callback to return %true if a CPU which supports * runtime configurable endianness is currently big-endian. Non-configurable * CPUs can use the default implementation of this method. This method should @@ -203,10 +209,6 @@ struct CPUClass { void (*do_unaligned_access)(CPUState *cpu, vaddr addr, MMUAccessType access_type, int mmu_idx, uintptr_t retaddr); - void (*do_transaction_failed)(CPUState *cpu, hwaddr physaddr, vaddr addr, - unsigned size, MMUAccessType access_type, - int mmu_idx, MemTxAttrs attrs, - MemTxResult response, uintptr_t retaddr); bool (*virtio_is_big_endian)(CPUState *cpu); int (*memory_rw_debug)(CPUState *cpu, vaddr addr, uint8_t *buf, int len, bool is_write); @@ -879,9 +881,6 @@ CPUState *cpu_by_arch_id(int64_t id); void cpu_interrupt(CPUState *cpu, int mask); -#ifdef NEED_CPU_H - -#ifdef CONFIG_SOFTMMU static inline void cpu_unaligned_access(CPUState *cpu, vaddr addr, MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) @@ -900,14 +899,13 @@ static inline void cpu_transaction_failed(CPUState *cpu, hwaddr physaddr, { CPUClass *cc = CPU_GET_CLASS(cpu); - if (!cpu->ignore_memory_transaction_failures && cc->do_transaction_failed) { - cc->do_transaction_failed(cpu, physaddr, addr, size, access_type, - mmu_idx, attrs, response, retaddr); + if (!cpu->ignore_memory_transaction_failures && + cc->tcg_ops.do_transaction_failed) { + cc->tcg_ops.do_transaction_failed(cpu, physaddr, addr, size, + access_type, mmu_idx, attrs, + response, retaddr); } } -#endif - -#endif /* NEED_CPU_H */ /** * cpu_set_pc: diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index f9442731dd..46c71a0ac8 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -116,6 +116,8 @@ static const MemoryRegionOps dma_dummy_ops = { #define MAGNUM_BIOS_SIZE_MAX 0x7e000 #define MAGNUM_BIOS_SIZE \ (BIOS_SIZE < MAGNUM_BIOS_SIZE_MAX ? BIOS_SIZE : MAGNUM_BIOS_SIZE_MAX) + +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static void (*real_do_transaction_failed)(CPUState *cpu, hwaddr physaddr, vaddr addr, unsigned size, MMUAccessType access_type, @@ -137,6 +139,7 @@ static void mips_jazz_do_transaction_failed(CPUState *cs, hwaddr physaddr, (*real_do_transaction_failed)(cs, physaddr, addr, size, access_type, mmu_idx, attrs, response, retaddr); } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ static void mips_jazz_init(MachineState *machine, enum jazz_model_e jazz_model) @@ -205,8 +208,10 @@ static void mips_jazz_init(MachineState *machine, * memory region that catches all memory accesses, as we do on Malta. */ cc = CPU_GET_CLASS(cpu); - real_do_transaction_failed = cc->do_transaction_failed; - cc->do_transaction_failed = mips_jazz_do_transaction_failed; +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) + real_do_transaction_failed = cc->tcg_ops.do_transaction_failed; + cc->tcg_ops.do_transaction_failed = mips_jazz_do_transaction_failed; +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ /* allocate RAM */ memory_region_add_subregion(address_space, 0, machine->ram); diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c index 66f1166672..a1696bebeb 100644 --- a/target/alpha/cpu.c +++ b/target/alpha/cpu.c @@ -225,7 +225,7 @@ static void alpha_cpu_class_init(ObjectClass *oc, void *data) cc->gdb_write_register = alpha_cpu_gdb_write_register; cc->tcg_ops.tlb_fill = alpha_cpu_tlb_fill; #ifndef CONFIG_USER_ONLY - cc->do_transaction_failed = alpha_cpu_do_transaction_failed; + cc->tcg_ops.do_transaction_failed = alpha_cpu_do_transaction_failed; cc->do_unaligned_access = alpha_cpu_do_unaligned_access; cc->get_phys_page_debug = alpha_cpu_get_phys_page_debug; dc->vmsd = &vmstate_alpha_cpu; diff --git a/target/arm/cpu.c b/target/arm/cpu.c index dfb2398392..bd1882944c 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2283,11 +2283,11 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) cc->debug_check_watchpoint = arm_debug_check_watchpoint; cc->do_unaligned_access = arm_cpu_do_unaligned_access; #if !defined(CONFIG_USER_ONLY) - cc->do_transaction_failed = arm_cpu_do_transaction_failed; + cc->tcg_ops.do_transaction_failed = arm_cpu_do_transaction_failed; cc->adjust_watchpoint_address = arm_adjust_watchpoint_address; cc->tcg_ops.do_interrupt = arm_cpu_do_interrupt; #endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ -#endif +#endif /* CONFIG_TCG */ } #ifdef CONFIG_KVM diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index 69093a621f..e68b933c84 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -473,7 +473,7 @@ static void m68k_cpu_class_init(ObjectClass *c, void *data) cc->gdb_write_register = m68k_cpu_gdb_write_register; cc->tcg_ops.tlb_fill = m68k_cpu_tlb_fill; #if defined(CONFIG_SOFTMMU) - cc->do_transaction_failed = m68k_cpu_transaction_failed; + cc->tcg_ops.do_transaction_failed = m68k_cpu_transaction_failed; cc->get_phys_page_debug = m68k_cpu_get_phys_page_debug; dc->vmsd = &vmstate_m68k_cpu; #endif diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index c93e44b8e5..e405f6422d 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -374,7 +374,7 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data) cc->gdb_write_register = mb_cpu_gdb_write_register; cc->tcg_ops.tlb_fill = mb_cpu_tlb_fill; #ifndef CONFIG_USER_ONLY - cc->do_transaction_failed = mb_cpu_transaction_failed; + cc->tcg_ops.do_transaction_failed = mb_cpu_transaction_failed; cc->get_phys_page_attrs_debug = mb_cpu_get_phys_page_attrs_debug; dc->vmsd = &vmstate_mb_cpu; #endif diff --git a/target/mips/cpu.c b/target/mips/cpu.c index a88a138a8d..ed2a7664e9 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -681,7 +681,6 @@ static void mips_cpu_class_init(ObjectClass *c, void *data) cc->gdb_read_register = mips_cpu_gdb_read_register; cc->gdb_write_register = mips_cpu_gdb_write_register; #ifndef CONFIG_USER_ONLY - cc->do_transaction_failed = mips_cpu_do_transaction_failed; cc->do_unaligned_access = mips_cpu_do_unaligned_access; cc->get_phys_page_debug = mips_cpu_get_phys_page_debug; cc->vmsd = &vmstate_mips_cpu; @@ -693,6 +692,9 @@ static void mips_cpu_class_init(ObjectClass *c, void *data) cc->tcg_ops.cpu_exec_interrupt = mips_cpu_exec_interrupt; cc->tcg_ops.synchronize_from_tb = mips_cpu_synchronize_from_tb; cc->tcg_ops.tlb_fill = mips_cpu_tlb_fill; +#ifndef CONFIG_USER_ONLY + cc->tcg_ops.do_transaction_failed = mips_cpu_do_transaction_failed; +#endif /* CONFIG_USER_ONLY */ #endif /* CONFIG_TCG */ cc->gdb_num_core_regs = 73; diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 345b78fc3d..9a23af9a9d 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -609,7 +609,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data) cc->gdb_stop_before_watchpoint = true; cc->disas_set_info = riscv_cpu_disas_set_info; #ifndef CONFIG_USER_ONLY - cc->do_transaction_failed = riscv_cpu_do_transaction_failed; + cc->tcg_ops.do_transaction_failed = riscv_cpu_do_transaction_failed; cc->do_unaligned_access = riscv_cpu_do_unaligned_access; cc->get_phys_page_debug = riscv_cpu_get_phys_page_debug; /* For now, mark unmigratable: */ diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index f8350f5f78..2f43939fb6 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -671,7 +671,7 @@ void riscv_cpu_do_unaligned_access(CPUState *cs, vaddr addr, env->badaddr = addr; riscv_raise_exception(env, cs->exception_index, retaddr); } -#endif +#endif /* !CONFIG_USER_ONLY */ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 871b2a83c6..8d6d7c1f83 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -875,7 +875,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data) cc->gdb_write_register = sparc_cpu_gdb_write_register; cc->tcg_ops.tlb_fill = sparc_cpu_tlb_fill; #ifndef CONFIG_USER_ONLY - cc->do_transaction_failed = sparc_cpu_do_transaction_failed; + cc->tcg_ops.do_transaction_failed = sparc_cpu_do_transaction_failed; cc->do_unaligned_access = sparc_cpu_do_unaligned_access; cc->get_phys_page_debug = sparc_cpu_get_phys_page_debug; cc->vmsd = &vmstate_sparc_cpu; diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index 3ff025f0fe..fc52fde696 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -205,7 +205,7 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void *data) #ifndef CONFIG_USER_ONLY cc->do_unaligned_access = xtensa_cpu_do_unaligned_access; cc->get_phys_page_debug = xtensa_cpu_get_phys_page_debug; - cc->do_transaction_failed = xtensa_cpu_do_transaction_failed; + cc->tcg_ops.do_transaction_failed = xtensa_cpu_do_transaction_failed; #endif cc->tcg_ops.debug_excp_handler = xtensa_breakpoint_handler; cc->disas_set_info = xtensa_cpu_disas_set_info; diff --git a/target/xtensa/helper.c b/target/xtensa/helper.c index 05e2b7f70a..eeffee297d 100644 --- a/target/xtensa/helper.c +++ b/target/xtensa/helper.c @@ -261,7 +261,7 @@ bool xtensa_cpu_tlb_fill(CPUState *cs, vaddr address, int size, cpu_loop_exit_restore(cs, retaddr); } -#else +#else /* !CONFIG_USER_ONLY */ void xtensa_cpu_do_unaligned_access(CPUState *cs, vaddr addr, MMUAccessType access_type, @@ -337,4 +337,4 @@ void xtensa_runstall(CPUXtensaState *env, bool runstall) qemu_cpu_kick(cpu); } } -#endif +#endif /* !CONFIG_USER_ONLY */