mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
[HVM][SVM] Revert changeset 11679:a949bd6ceb85
Although in the correct spirit, it seems there is some other dependency in the code that assumes ExtInts are queued until thay can be immediately delivered (EFLAGS.IF==1). This patch therefore caused instability in Linux guests. Signed-off-by: Keir Fraser <keir@xensource.com>
This commit is contained in:
1 parent
f58fdb8d02
commit
2eb4f7a7df
1 file changed
+9
@@ -74,6 +74,7 @@ asmlinkage void svm_intr_assist(void)
|
||||
int intr_type = APIC_DM_EXTINT;
|
||||
int intr_vector = -1;
|
||||
int re_injecting = 0;
|
||||
unsigned long rflags;
|
||||
|
||||
ASSERT(vmcb);
|
||||
|
||||
@@ -86,6 +87,14 @@ asmlinkage void svm_intr_assist(void)
|
||||
re_injecting = 1;
|
||||
}
|
||||
|
||||
/* Guest's interrputs masked? */
|
||||
rflags = vmcb->rflags;
|
||||
if (irq_masked(rflags)) {
|
||||
HVM_DBG_LOG(DBG_LEVEL_1, "Guest IRQs masked: rflags: %lx", rflags);
|
||||
/* bail out, we won't be injecting an interrupt this time */
|
||||
return;
|
||||
}
|
||||
|
||||
/* Previous interrupt still pending? */
|
||||
if (vmcb->vintr.fields.irq) {
|
||||
// printk("Re-injecting IRQ from Vintr\n");
|
||||
|
||||