diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-10-07 07:21:31 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-10-07 07:21:31 +0100 |
| commit | bac0999325056a3b3a92f7622df7ffbc5388b1c3 (patch) | |
| tree | e14141725b8fb81ecff74c3a5f963d0006dc43a0 /xen/arch/x86/hvm/emulate.c | |
| parent | 7cb99e3e8149259031edad6ac572389f4423b6cc (diff) | |
| download | xen-bac0999325056a3b3a92f7622df7ffbc5388b1c3.tar.gz xen-bac0999325056a3b3a92f7622df7ffbc5388b1c3.tar.bz2 xen-bac0999325056a3b3a92f7622df7ffbc5388b1c3.zip | |
x86 hvm: Do not incorrectly retire an instruction emulation when a
read/write cycle to qemu is dropped due to guest suspend.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'xen/arch/x86/hvm/emulate.c')
| -rw-r--r-- | xen/arch/x86/hvm/emulate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index a8c6d1a5e3..ac3f807c22 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -163,8 +163,8 @@ static int hvmemul_do_io( curr->arch.hvm_vcpu.io_state = HVMIO_none; break; case X86EMUL_UNHANDLEABLE: - hvm_send_assist_req(curr); - rc = (p_data != NULL) ? X86EMUL_RETRY : X86EMUL_OKAY; + rc = (!hvm_send_assist_req(curr) || (p_data != NULL) + ? X86EMUL_RETRY : X86EMUL_OKAY); break; default: BUG(); |