From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37217) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnhPk-00045c-Lt for qemu-devel@nongnu.org; Tue, 14 Mar 2017 04:02:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnhPj-0006km-Or for qemu-devel@nongnu.org; Tue, 14 Mar 2017 04:02:40 -0400 From: Jason Wang Date: Tue, 14 Mar 2017 16:02:28 +0800 Message-Id: <1489478550-19431-2-git-send-email-jasowang@redhat.com> In-Reply-To: <1489478550-19431-1-git-send-email-jasowang@redhat.com> References: <1489478550-19431-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PULL 1/3] e1000e: correctly tear down MSI-X memory regions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org, qemu-devel@nongnu.org Cc: Paolo Bonzini , Jason Wang , qemu-stable@nongnu.org From: Paolo Bonzini MSI-X has been disabled by the time the e1000e device is unrealized, hence msix_uninit is never called. This causes the object to be leaked, which shows up as a RAMBlock with empty name when attempting migration. Reported-by: Dr. David Alan Gilbert Cc: Jason Wang Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini Tested-by: Laurent Vivier Signed-off-by: Jason Wang --- hw/net/e1000e.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index b0f429b..6e23493 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -306,7 +306,7 @@ e1000e_init_msix(E1000EState *s) static void e1000e_cleanup_msix(E1000EState *s) { - if (msix_enabled(PCI_DEVICE(s))) { + if (msix_present(PCI_DEVICE(s))) { e1000e_unuse_msix_vectors(s, E1000E_MSIX_VEC_NUM); msix_uninit(PCI_DEVICE(s), &s->msix, &s->msix); } -- 2.7.4