From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X6iVr-00064K-1P for qemu-devel@nongnu.org; Mon, 14 Jul 2014 11:50:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X6iVh-0002tF-UK for qemu-devel@nongnu.org; Mon, 14 Jul 2014 11:49:58 -0400 Received: from mail-qc0-x22c.google.com ([2607:f8b0:400d:c01::22c]:48058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X6iVh-0002sw-QN for qemu-devel@nongnu.org; Mon, 14 Jul 2014 11:49:49 -0400 Received: by mail-qc0-f172.google.com with SMTP id l6so3733298qcy.3 for ; Mon, 14 Jul 2014 08:49:49 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 14 Jul 2014 17:49:28 +0200 Message-Id: <1405352968-3155-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1405352968-3155-1-git-send-email-pbonzini@redhat.com> References: <1405352968-3155-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 5/5] serial-pci: remove memory regions from BAR before destroying them List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster Otherwise, hot-unplug of pci-serial-2x trips the assertion in memory_region_destroy: (qemu) device_del gg (qemu) qemu-system-x86_64: /work/armbru/tmp/qemu/memory.c:1021: memory_region_destroy: Assertion `((&mr->subregions)->tqh_first == ((void *)0))' failed. Aborted (core dumped) Reported-by: Markus Armbruster Reviewed-by: Markus Armbruster Signed-off-by: Paolo Bonzini --- hw/char/serial-pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c index f53bb9c..c133c33 100644 --- a/hw/char/serial-pci.c +++ b/hw/char/serial-pci.c @@ -148,6 +148,7 @@ static void multi_serial_pci_exit(PCIDevice *dev) for (i = 0; i < pci->ports; i++) { s = pci->state + i; serial_exit_core(s); + memory_region_del_subregion(&pci->iobar, &s->io); memory_region_destroy(&s->io); g_free(pci->name[i]); } -- 1.9.3