Message ID | 20141030093100.7176.716.stgit@PASHA-ISP |
---|---|
State | New |
Headers | show |
On 10/30/2014 10:31 AM, Pavel Dovgalyuk wrote: > When QEMU works in icount mode cpu_restore_state function performs two actions: > restoring the program counter and updating icount to the correct value. > kvmvapic's patch_instruction function is called by cpu_report_tpr_access > function which also invokes cpu_restore_state. It results to calling > cpu_restore_state twice - in cpu_report_tpr_access and in patch_instruction. > When icount is disabled second call is safe. But when icount is enabled, > cpu_restore_state modifies instructions counter twice, which leads to incorrect > behavior. This patch removes useless cpu_restore_state call from kvmvapic. > > Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru> > --- > hw/i386/kvmvapic.c | 1 - > 1 files changed, 0 insertions(+), 1 deletions(-) > > diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c > index f9da050..28547a7 100644 > --- a/hw/i386/kvmvapic.c > +++ b/hw/i386/kvmvapic.c > @@ -405,7 +405,6 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip) > } > > if (!kvm_enabled()) { > - cpu_restore_state(cs, cs->mem_io_pc); > cpu_get_tb_cpu_state(env, ¤t_pc, ¤t_cs_base, > ¤t_flags); > } > Thanks, applying. Paolo
diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index f9da050..28547a7 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -405,7 +405,6 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip) } if (!kvm_enabled()) { - cpu_restore_state(cs, cs->mem_io_pc); cpu_get_tb_cpu_state(env, ¤t_pc, ¤t_cs_base, ¤t_flags); }
When QEMU works in icount mode cpu_restore_state function performs two actions: restoring the program counter and updating icount to the correct value. kvmvapic's patch_instruction function is called by cpu_report_tpr_access function which also invokes cpu_restore_state. It results to calling cpu_restore_state twice - in cpu_report_tpr_access and in patch_instruction. When icount is disabled second call is safe. But when icount is enabled, cpu_restore_state modifies instructions counter twice, which leads to incorrect behavior. This patch removes useless cpu_restore_state call from kvmvapic. Signed-off-by: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru> --- hw/i386/kvmvapic.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)