Fix i8259 initialization, by Bernhard Kauer.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3100 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/hw/i8259.c b/hw/i8259.c
index 4b25df3b9c1992e64caa51d8eb129711f6e0720d..506377079743160c73f1d496ee7b970b658fef41 100644 (file)
--- a/hw/i8259.c
+++ b/hw/i8259.c
@@ -351,7 +351,7 @@ static void pic_ioport_write(void *opaque, uint32_t addr, uint32_t val)
             break;
         case 1:
             s->irq_base = val & 0xf8;
-            s->init_state = s->single_mode && s->init4 ? 3 : 2;
+            s->init_state = s->single_mode ? (s->init4 ? 3 : 0) : 2;
             break;
         case 2:
             if (s->init4) {