Browse Source

bsd-user, linux-user: introduce qemu_process_cpu_events

Add a user-mode emulation version of the function.  More will be
added later, for now it is just process_queued_cpu_work.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
pull/305/head
Paolo Bonzini 7 months ago
parent
commit
758e5de501
  1. 5
      accel/tcg/user-exec.c
  2. 2
      bsd-user/aarch64/target_arch_cpu.h
  3. 2
      bsd-user/arm/target_arch_cpu.h
  4. 2
      bsd-user/i386/target_arch_cpu.h
  5. 2
      bsd-user/riscv/target_arch_cpu.h
  6. 2
      bsd-user/x86_64/target_arch_cpu.h
  7. 9
      include/hw/core/cpu.h
  8. 1
      include/system/cpus.h
  9. 2
      linux-user/aarch64/cpu_loop.c
  10. 2
      linux-user/alpha/cpu_loop.c
  11. 2
      linux-user/arm/cpu_loop.c
  12. 2
      linux-user/hexagon/cpu_loop.c
  13. 2
      linux-user/hppa/cpu_loop.c
  14. 2
      linux-user/i386/cpu_loop.c
  15. 2
      linux-user/loongarch64/cpu_loop.c
  16. 2
      linux-user/m68k/cpu_loop.c
  17. 2
      linux-user/microblaze/cpu_loop.c
  18. 2
      linux-user/mips/cpu_loop.c
  19. 2
      linux-user/openrisc/cpu_loop.c
  20. 2
      linux-user/ppc/cpu_loop.c
  21. 2
      linux-user/riscv/cpu_loop.c
  22. 2
      linux-user/s390x/cpu_loop.c
  23. 2
      linux-user/sh4/cpu_loop.c
  24. 2
      linux-user/sparc/cpu_loop.c
  25. 2
      linux-user/xtensa/cpu_loop.c

5
accel/tcg/user-exec.c

@ -52,6 +52,11 @@ void qemu_cpu_kick(CPUState *cpu)
tcg_kick_vcpu_thread(cpu);
}
void qemu_process_cpu_events(CPUState *cpu)
{
process_queued_cpu_work(cpu);
}
/*
* Adjust the pc to pass to cpu_restore_state; return the memop type.
*/

2
bsd-user/aarch64/target_arch_cpu.h

@ -54,7 +54,7 @@ static inline G_NORETURN void target_cpu_loop(CPUARMState *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch (trapnr) {
case EXCP_SWI:

2
bsd-user/arm/target_arch_cpu.h

@ -46,7 +46,7 @@ static inline G_NORETURN void target_cpu_loop(CPUARMState *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch (trapnr) {
case EXCP_UDEF:
case EXCP_NOCP:

2
bsd-user/i386/target_arch_cpu.h

@ -113,7 +113,7 @@ static inline G_NORETURN void target_cpu_loop(CPUX86State *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch (trapnr) {
case 0x80: {

2
bsd-user/riscv/target_arch_cpu.h

@ -49,7 +49,7 @@ static inline G_NORETURN void target_cpu_loop(CPURISCVState *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
signo = 0;

2
bsd-user/x86_64/target_arch_cpu.h

@ -121,7 +121,7 @@ static inline G_NORETURN void target_cpu_loop(CPUX86State *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch (trapnr) {
case EXCP_SYSCALL:

9
include/hw/core/cpu.h

@ -1145,6 +1145,15 @@ AddressSpace *cpu_get_address_space(CPUState *cpu, int asidx);
G_NORETURN void cpu_abort(CPUState *cpu, const char *fmt, ...)
G_GNUC_PRINTF(2, 3);
/**
* qemu_process_cpu_events:
* @cpu: CPU that left the execution loop
*
* Perform accelerator-independent work after the CPU has left
* the inner execution loop.
*/
void qemu_process_cpu_events(CPUState *cpu);
/* $(top_srcdir)/cpu.c */
void cpu_class_init_props(DeviceClass *dc);
void cpu_exec_class_post_init(CPUClass *cc);

1
include/system/cpus.h

@ -18,7 +18,6 @@ bool cpu_thread_is_idle(CPUState *cpu);
bool all_cpu_threads_idle(void);
bool cpu_can_run(CPUState *cpu);
void qemu_process_cpu_events_common(CPUState *cpu);
void qemu_process_cpu_events(CPUState *cpu);
void cpu_thread_signal_created(CPUState *cpu);
void cpu_thread_signal_destroyed(CPUState *cpu);
void cpu_handle_guest_debug(CPUState *cpu);

2
linux-user/aarch64/cpu_loop.c

@ -38,7 +38,7 @@ void cpu_loop(CPUARMState *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch (trapnr) {
case EXCP_SWI:

2
linux-user/alpha/cpu_loop.c

@ -35,7 +35,7 @@ void cpu_loop(CPUAlphaState *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch (trapnr) {
case EXCP_RESET:

2
linux-user/arm/cpu_loop.c

@ -295,7 +295,7 @@ void cpu_loop(CPUARMState *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch(trapnr) {
case EXCP_UDEF:

2
linux-user/hexagon/cpu_loop.c

@ -36,7 +36,7 @@ void cpu_loop(CPUHexagonState *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch (trapnr) {
case EXCP_INTERRUPT:

2
linux-user/hppa/cpu_loop.c

@ -119,7 +119,7 @@ void cpu_loop(CPUHPPAState *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch (trapnr) {
case EXCP_SYSCALL:

2
linux-user/i386/cpu_loop.c

@ -214,7 +214,7 @@ void cpu_loop(CPUX86State *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch(trapnr) {
case 0x80:

2
linux-user/loongarch64/cpu_loop.c

@ -27,7 +27,7 @@ void cpu_loop(CPULoongArchState *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch (trapnr) {
case EXCP_INTERRUPT:

2
linux-user/m68k/cpu_loop.c

@ -33,7 +33,7 @@ void cpu_loop(CPUM68KState *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch(trapnr) {
case EXCP_ILLEGAL:

2
linux-user/microblaze/cpu_loop.c

@ -32,7 +32,7 @@ void cpu_loop(CPUMBState *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch (trapnr) {
case EXCP_INTERRUPT:

2
linux-user/mips/cpu_loop.c

@ -74,7 +74,7 @@ void cpu_loop(CPUMIPSState *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch(trapnr) {
case EXCP_SYSCALL:

2
linux-user/openrisc/cpu_loop.c

@ -33,7 +33,7 @@ void cpu_loop(CPUOpenRISCState *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch (trapnr) {
case EXCP_SYSCALL:

2
linux-user/ppc/cpu_loop.c

@ -77,7 +77,7 @@ void cpu_loop(CPUPPCState *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
arch_interrupt = true;
switch (trapnr) {

2
linux-user/riscv/cpu_loop.c

@ -36,7 +36,7 @@ void cpu_loop(CPURISCVState *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch (trapnr) {
case EXCP_INTERRUPT:

2
linux-user/s390x/cpu_loop.c

@ -64,7 +64,7 @@ void cpu_loop(CPUS390XState *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch (trapnr) {
case EXCP_INTERRUPT:

2
linux-user/sh4/cpu_loop.c

@ -34,7 +34,7 @@ void cpu_loop(CPUSH4State *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch (trapnr) {
case 0x160:

2
linux-user/sparc/cpu_loop.c

@ -220,7 +220,7 @@ void cpu_loop (CPUSPARCState *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
switch (trapnr) {
case TARGET_TT_SYSCALL:

2
linux-user/xtensa/cpu_loop.c

@ -133,7 +133,7 @@ void cpu_loop(CPUXtensaState *env)
cpu_exec_start(cs);
trapnr = cpu_exec(cs);
cpu_exec_end(cs);
process_queued_cpu_work(cs);
qemu_process_cpu_events(cs);
env->sregs[PS] &= ~PS_EXCM;
switch (trapnr) {

Loading…
Cancel
Save