diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-12-04 20:16:07 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-12-16 08:35:24 +0000 |
| commit | a8a826a3c3b8c8a1c4def0e9e22b46e78e6163a0 (patch) | |
| tree | 4477f11f1fdb1a5f1ad2914d1ebbf86e4c2df435 /hw | |
| parent | 5b6dd8683dc30e8e0970db3dd9176732dc819410 (diff) | |
| download | qemu-a8a826a3c3b8c8a1c4def0e9e22b46e78e6163a0.tar.gz | |
exec: refactor cpu_restore_state
Refactor common code around calls to cpu_restore_state().
tb_find_pc() has now no external users, make it static.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/kvmvapic.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/kvmvapic.c b/hw/kvmvapic.c index e04c4011d7..60c8fc46aa 100644 --- a/hw/kvmvapic.c +++ b/hw/kvmvapic.c @@ -387,7 +387,6 @@ static void patch_instruction(VAPICROMState *s, CPUX86State *env, target_ulong i VAPICHandlers *handlers; uint8_t opcode[2]; uint32_t imm32; - TranslationBlock *current_tb; target_ulong current_pc = 0; target_ulong current_cs_base = 0; int current_flags = 0; @@ -399,8 +398,7 @@ static void patch_instruction(VAPICROMState *s, CPUX86State *env, target_ulong i } if (!kvm_enabled()) { - current_tb = tb_find_pc(env->mem_io_pc); - cpu_restore_state(current_tb, env, env->mem_io_pc); + cpu_restore_state(env, env->mem_io_pc); cpu_get_tb_cpu_state(env, ¤t_pc, ¤t_cs_base, ¤t_flags); } |