From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=55106 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PD9Z6-0008PI-1i for qemu-devel@nongnu.org; Tue, 02 Nov 2010 01:37:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PD9Z5-0003K8-0l for qemu-devel@nongnu.org; Tue, 02 Nov 2010 01:37:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59921) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PD9Z4-0003K1-PE for qemu-devel@nongnu.org; Tue, 02 Nov 2010 01:37:46 -0400 From: Alex Williamson Date: Mon, 01 Nov 2010 23:37:45 -0600 Message-ID: <20101102053738.10424.81682.stgit@s20.home> In-Reply-To: <20101102053544.10424.42769.stgit@s20.home> References: <20101102053544.10424.42769.stgit@s20.home> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 2/3] msi: Cleanup uninit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com, yamahata@valinux.co.jp Cc: alex.williamson@redhat.com, qemu-devel@nongnu.org This makes msi_uninit more similar to msix_uninit, doing nothing if not enable, clearing msi_cap and capability flag. Signed-off-by: Alex Williamson --- hw/msi.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/msi.c b/hw/msi.c index 0ad4e38..110859b 100644 --- a/hw/msi.c +++ b/hw/msi.c @@ -170,9 +170,15 @@ int msi_init(struct PCIDevice *dev, uint8_t offset, void msi_uninit(struct PCIDevice *dev) { - uint16_t flags = pci_get_word(dev->config + msi_flags_off(dev)); - uint8_t cap_size = msi_cap_sizeof(flags); + uint8_t cap_size; + + if (!(dev->cap_present & QEMU_PCI_CAP_MSI)) + return; + + cap_size = msi_cap_sizeof(pci_get_word(dev->config + msi_flags_off(dev))); pci_del_capability(dev, PCI_CAP_ID_MSIX, cap_size); + dev->msi_cap = 0; + dev->cap_present &= ~QEMU_PCI_CAP_MSI; MSI_DEV_PRINTF(dev, "uninit\n"); }