mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
Absolutely must not return to HVM guest context until
synchronous I/O emulation is completed. Signed-off-by: Keir Fraser <keir@xensource.com>
This commit is contained in:
kaf24@firebug.cl.cam.ac.uk committed
1 parent
11a47e4094
commit
55c5cfb9b4
2 files changed
+4
-2
No files matched your search
@@ -489,7 +489,8 @@ void svm_do_resume(struct vcpu *v)
|
||||
{
|
||||
struct hvm_virpit *vpit = &v->domain->arch.hvm_domain.vpit;
|
||||
|
||||
if ( event_pending(v) )
|
||||
if ( event_pending(v) ||
|
||||
test_bit(ARCH_HVM_IO_WAIT, &v->arch.hvm_vcpu.ioflags) )
|
||||
hvm_wait_io();
|
||||
|
||||
/* pick up the elapsed PIT ticks and re-enable pit_timer */
|
||||
|
||||
@@ -177,7 +177,8 @@ void vmx_do_resume(struct vcpu *v)
|
||||
|
||||
vmx_stts();
|
||||
|
||||
if ( event_pending(v) )
|
||||
if ( event_pending(v) ||
|
||||
test_bit(ARCH_HVM_IO_WAIT, &v->arch.hvm_vcpu.ioflags) )
|
||||
hvm_wait_io();
|
||||
|
||||
/* pick up the elapsed PIT ticks and re-enable pit_timer */
|
||||
|
||||