Commit ada720d1e8 for qemu.org
commit ada720d1e8b74f7570d2a3a4052296a4ee234675
Author: Markku Ahvenjärvi <mankku@gmail.com>
Date: Wed Sep 23 15:20:04 2026 +0300
hw/nvme: clear interrupts on controller reset
Clear stale CQ interrupt state and ensure the interrupt line is
deasserted when resetting an NVMe controller.
Cc: qemu-stable@nongnu.org
Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4142
Fixes: 83d7ed5c570d ("hw/nvme: fix pin-based interrupt behavior (again)")
Signed-off-by: Markku Ahvenjärvi <mankku@gmail.com>
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index 52fa4b327c..4a626203ca 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -8136,6 +8136,10 @@ static void nvme_ctrl_reset(NvmeCtrl *n, NvmeResetType rst)
stl_le_p(&n->bar.intmc, 0);
stl_le_p(&n->bar.cc, 0);
+ n->cq_pending = 0;
+ n->irq_status = 0;
+ nvme_irq_check(n);
+
n->dbbuf_dbs = 0;
n->dbbuf_eis = 0;
n->dbbuf_enabled = false;