From 20faf0f5f8aba33405a6206cd26f0d2b49ac174a Mon Sep 17 00:00:00 2001 From: Li Qiang Date: Sun, 28 Oct 2018 23:29:40 -0700 Subject: nvme: don't unref ctrl_mem when device unrealized Currently, when hotplug/unhotplug nvme device, it will cause an assert in object.c. Following is the backtrack: ERROR:qom/object.c:981:object_unref: assertion failed: (obj->ref > 0) Thread 2 "qemu-system-x86" received signal SIGABRT, Aborted. [Switching to Thread 0x7fffcbd32700 (LWP 18844)] 0x00007fffdb9e4fff in raise () from /lib/x86_64-linux-gnu/libc.so.6 (gdb) bt /lib/x86_64-linux-gnu/libglib-2.0.so.0 /lib/x86_64-linux-gnu/libglib-2.0.so.0 qom/object.c:981 /home/liqiang02/qemu-upstream/qemu/memory.c:1732 /home/liqiang02/qemu-upstream/qemu/memory.c:285 util/qemu-thread-posix.c:504 /lib/x86_64-linux-gnu/libpthread.so.0 This is caused by memory_region_unref in nvme_exit. Remove it to make the PCIdevice refcount correct. Signed-off-by: Li Qiang Reviewed-by: Igor Mammedov Signed-off-by: Kevin Wolf --- hw/block/nvme.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'hw') diff --git a/hw/block/nvme.c b/hw/block/nvme.c index fc7dacb..359a06d 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1331,9 +1331,6 @@ static void nvme_exit(PCIDevice *pci_dev) g_free(n->namespaces); g_free(n->cq); g_free(n->sq); - if (n->cmbsz) { - memory_region_unref(&n->ctrl_mem); - } msix_uninit_exclusive_bar(pci_dev); } -- cgit v1.1 From a883d6a0bcbff889c932015179a25a1b5ea8e096 Mon Sep 17 00:00:00 2001 From: Li Qiang Date: Sun, 28 Oct 2018 23:29:41 -0700 Subject: nvme: free cmbuf in nvme_exit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This avoid a memory leak in unhotplug nvme device. Signed-off-by: Li Qiang Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Kevin Wolf --- hw/block/nvme.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'hw') diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 359a06d..09d7c90 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1332,6 +1332,9 @@ static void nvme_exit(PCIDevice *pci_dev) g_free(n->cq); g_free(n->sq); + if (n->cmb_size_mb) { + g_free(n->cmbuf); + } msix_uninit_exclusive_bar(pci_dev); } -- cgit v1.1