---

yaml --- r: 297132 b: refs/heads/master c: 242ec97 h: refs/heads/master v: v3
git-mirror · Mar 5, 2012 · 5cbb7e4 · 5cbb7e4
1 parent 8776919
commit 5cbb7e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2a1b483a4a3f4bbb5fec1877f716c15ac7fa405
+refs/heads/master: 242ec97c358256ad6e62dab869f63a03cd244122
diff --git a/trunk/arch/x86/kvm/i8259.c b/trunk/arch/x86/kvm/i8259.c
@@ -307,6 +307,7 @@ static void pic_ioport_write(void *opaque, u32 addr, u32 val)
 		if (val & 0x10) {
 			s->init4 = val & 1;
 			s->last_irr = 0;
+			s->irr &= s->elcr;
 			s->imr = 0;
 			s->priority_add = 0;
 			s->special_mask = 0;