Commit 0ea8cb88 authored by Andreas Färber's avatar Andreas Färber
Browse files

cpu-exec: Change cpu_resume_from_signal() argument to CPUState 



Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent b3310ab3

cpu-exec.c

+1 −3
Original line number Diff line number Diff line
@@ -33,10 +33,8 @@ void cpu_loop_exit(CPUState *cpu) 
   restored in a state compatible with the CPU emulator

 */

#if defined(CONFIG_SOFTMMU)

void cpu_resume_from_signal(CPUArchState *env, void *puc)

void cpu_resume_from_signal(CPUState *cpu, void *puc)

{

    CPUState *cpu = ENV_GET_CPU(env);



    /* XXX: restore cpu registers saved in host registers */



    cpu->exception_index = -1;

exec.c

+1 −1
Original line number Diff line number Diff line
@@ -1608,7 +1608,7 @@ static void check_watchpoint(int offset, int len_mask, int flags) 
                } else {

                    cpu_get_tb_cpu_state(env, &pc, &cs_base, &cpu_flags);

                    tb_gen_code(cpu, pc, cs_base, cpu_flags, 1);

                    cpu_resume_from_signal(env, NULL);

                    cpu_resume_from_signal(cpu, NULL);

                }

            }

        } else {

hw/i386/kvmvapic.c

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip) 
    if (!kvm_enabled()) {

        cs->current_tb = NULL;

        tb_gen_code(cs, current_pc, current_cs_base, current_flags, 1);

        cpu_resume_from_signal(env, NULL);

        cpu_resume_from_signal(cs, NULL);

    }

}

include/exec/exec-all.h

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ int cpu_gen_code(CPUArchState *env, struct TranslationBlock *tb, 
bool cpu_restore_state(CPUState *cpu, uintptr_t searched_pc);

void page_size_init(void);



void QEMU_NORETURN cpu_resume_from_signal(CPUArchState *env1, void *puc);

void QEMU_NORETURN cpu_resume_from_signal(CPUState *cpu, void *puc);

void QEMU_NORETURN cpu_io_recompile(CPUState *cpu, uintptr_t retaddr);

TranslationBlock *tb_gen_code(CPUState *cpu,

                              target_ulong pc, target_ulong cs_base, int flags,

target-i386/helper.c

+1 −1
Original line number Diff line number Diff line
@@ -1102,7 +1102,7 @@ void breakpoint_handler(CPUX86State *env) 
            if (check_hw_breakpoints(env, false)) {

                raise_exception(env, EXCP01_DB);

            } else {

                cpu_resume_from_signal(env, NULL);

                cpu_resume_from_signal(cs, NULL);

            }

        }

    } else {