[Xen-changelog] [xen-unstable] x86 hvm: On failed hvm_send_assist_req(), io emulation state should be

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1254899226 -3600
# Node ID 440d22c01652ed8b22a51adeada1346d35611b77
# Parent  30bfa1d8895daa561e4a3d0fb11b7fabac154fe1
x86 hvm: On failed hvm_send_assist_req(), io emulation state should be
reset to HVMIO_none, as no IO is in flight.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/hvm/emulate.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff -r 30bfa1d8895d -r 440d22c01652 xen/arch/x86/hvm/emulate.c
--- a/xen/arch/x86/hvm/emulate.c        Wed Oct 07 07:50:20 2009 +0100
+++ b/xen/arch/x86/hvm/emulate.c        Wed Oct 07 08:07:06 2009 +0100
@@ -163,8 +163,11 @@ static int hvmemul_do_io(
         curr->arch.hvm_vcpu.io_state = HVMIO_none;
         break;
     case X86EMUL_UNHANDLEABLE:
-        rc = (!hvm_send_assist_req(curr) || (p_data != NULL)
-              ? X86EMUL_RETRY : X86EMUL_OKAY);
+        rc = X86EMUL_RETRY;
+        if ( !hvm_send_assist_req(curr) )
+            curr->arch.hvm_vcpu.io_state = HVMIO_none;
+        else if ( p_data == NULL )
+            rc = X86EMUL_OKAY;
         break;
     default:
         BUG();

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog