From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Mon, 9 May 2011 15:48:19 +0000 (+0200)
Subject: ahci: Fix crashes on duplicate BH registration
X-Git-Tag: v0.15.0-rc0~269
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4d29b50a41810684ad34e44352a630eb1dd94b58;p=qemu.git

ahci: Fix crashes on duplicate BH registration

If ahci_dma_set_inactive is called a while there is still a pending BH
from a previous run, we will crash on the second run of
ahci_check_cmd_bh as it overwrites AHCIDevice::check_bh. Avoid this
broken and redundant duplicate registration.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index c6e0c7767..744d19d6d 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1066,9 +1066,11 @@ static int ahci_dma_set_inactive(IDEDMA *dma)
 
     ad->dma_cb = NULL;
 
-    /* maybe we still have something to process, check later */
-    ad->check_bh = qemu_bh_new(ahci_check_cmd_bh, ad);
-    qemu_bh_schedule(ad->check_bh);
+    if (!ad->check_bh) {
+        /* maybe we still have something to process, check later */
+        ad->check_bh = qemu_bh_new(ahci_check_cmd_bh, ad);
+        qemu_bh_schedule(ad->check_bh);
+    }
 
     return 0;
 }