From 51336214da6f2eaa7baaa8efa1823377252c1496 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Fri, 30 Apr 2010 14:06:12 +0200 Subject: [PATCH] lsi: Purge request queue on soft reset Avoid keeping zombie requests across controller reset by purging the queue and also dropping the currently active request. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori --- hw/lsi53c895a.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index 98b7f541ce..ad23ece7a0 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -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)