From patchwork Mon May 2 09:13:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: MSI: Fix release of resources Date: Sun, 01 May 2011 23:13:57 -0000 From: Jan Kiszka X-Patchwork-Id: 93612 Message-Id: <4DBE75D5.8050901@siemens.com> To: qemu-devel Cc: Alexander Graf , Gerd Hoffmann msi_init may fail, so the users should check msi_present before calling msi_uninit. Signed-off-by: Jan Kiszka --- hw/ide/ich.c | 2 +- hw/intel-hda.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ide/ich.c b/hw/ide/ich.c index a3d475c..35e1de7 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -110,7 +110,7 @@ static int pci_ich9_uninit(PCIDevice *dev) struct AHCIPCIState *d; d = DO_UPCAST(struct AHCIPCIState, card, dev); - if (msi_enabled(dev)) { + if (msi_present(dev)) { msi_uninit(dev); } diff --git a/hw/intel-hda.c b/hw/intel-hda.c index b0b1d12..ff99348 100644 --- a/hw/intel-hda.c +++ b/hw/intel-hda.c @@ -1174,7 +1174,7 @@ static int intel_hda_exit(PCIDevice *pci) { IntelHDAState *d = DO_UPCAST(IntelHDAState, pci, pci); - if (d->msi) { + if (msi_present(pci)) { msi_uninit(&d->pci); } cpu_unregister_io_memory(d->mmio_addr);