]> git.proxmox.com Git - qemu.git/commitdiff
lsi: Purge request queue on soft reset
authorJan Kiszka <jan.kiszka@siemens.com>
Fri, 30 Apr 2010 12:06:12 +0000 (14:06 +0200)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 3 May 2010 17:09:48 +0000 (12:09 -0500)
Avoid keeping zombie requests across controller reset by purging the
queue and also dropping the currently active request.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
hw/lsi53c895a.c

index 98b7f541cec2ade0c3aa7dba45c8a86d3198426f..ad23ece7a01bba874592625f75e8d1033223c85c 100644 (file)
@@ -283,6 +283,8 @@ static inline int lsi_irq_on_rsl(LSIState *s)
 
 static void lsi_soft_reset(LSIState *s)
 {
+    lsi_request *p;
+
     DPRINTF("Reset\n");
     s->carry = 0;
 
@@ -345,6 +347,15 @@ static void lsi_soft_reset(LSIState *s)
     s->sbc = 0;
     s->csbc = 0;
     s->sbr = 0;
+    while (!QTAILQ_EMPTY(&s->queue)) {
+        p = QTAILQ_FIRST(&s->queue);
+        QTAILQ_REMOVE(&s->queue, p, next);
+        qemu_free(p);
+    }
+    if (s->current) {
+        qemu_free(s->current);
+        s->current = NULL;
+    }
 }
 
 static int lsi_dma_40bit(LSIState *s)