diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-08-09 18:44:49 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-08-09 18:44:49 +0000 |
| commit | d3da41e32bc6d6fac80d402aa1cc0f1d30539d98 (patch) | |
| tree | 6c19d94ccf6f054ae6fc6d26d94131a1dd577519 /cpu-exec.c | |
| parent | 8227421e0476d9caf2a9a089465bb40c23834e33 (diff) | |
| parent | d65e9815b1ff90dff35e4e679bfb231c24e408f7 (diff) | |
| download | qemu-d3da41e32bc6d6fac80d402aa1cc0f1d30539d98.tar.gz qemu-d3da41e32bc6d6fac80d402aa1cc0f1d30539d98.tar.bz2 qemu-d3da41e32bc6d6fac80d402aa1cc0f1d30539d98.zip | |
Merge branch 'x86cpu_qom_tcg_v2' of git://github.com/imammedo/qemu
* 'x86cpu_qom_tcg_v2' of git://github.com/imammedo/qemu:
target-i386: move tcg initialization into x86_cpu_initfn()
cleanup cpu_set_debug_excp_handler
target-xtensa: drop usage of prev_debug_excp_handler
target-i386: drop usage of prev_debug_excp_handler
Diffstat (limited to 'cpu-exec.c')
| -rw-r--r-- | cpu-exec.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 543460c34c..4fee0618bd 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -156,12 +156,9 @@ static inline TranslationBlock *tb_find_fast(CPUArchState *env) static CPUDebugExcpHandler *debug_excp_handler; -CPUDebugExcpHandler *cpu_set_debug_excp_handler(CPUDebugExcpHandler *handler) +void cpu_set_debug_excp_handler(CPUDebugExcpHandler *handler) { - CPUDebugExcpHandler *old_handler = debug_excp_handler; - debug_excp_handler = handler; - return old_handler; } static void cpu_handle_debug_exception(CPUArchState *env) |