motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 02:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

MSI: Robust resource release

Browse source 
msi_init may fail, so we need to check on uninit if the cap was
actually installed. This also avoids that the users need to check.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Jan Kiszka 2011-05-02 20:00:47 +02:00 • committed by Michael S. Tsirkin
parent 072476ea08
commit 45fe15c25a
3 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hw/ide/ich.c
View file

@ -110,10 +110,7 @@ static int pci_ich9_uninit(PCIDevice *dev)
struct AHCIPCIState *d; struct AHCIPCIState *d;
d = DO_UPCAST(struct AHCIPCIState, card, dev); d = DO_UPCAST(struct AHCIPCIState, card, dev);
if (msi_enabled(dev)) {
msi_uninit(dev); msi_uninit(dev);
}
qemu_unregister_reset(ahci_reset, d); qemu_unregister_reset(ahci_reset, d);
ahci_uninit(&d->ahci); ahci_uninit(&d->ahci);

2
hw/intel-hda.c
View file

@ -1165,9 +1165,7 @@ static int intel_hda_exit(PCIDevice *pci)
{ {
IntelHDAState *d = DO_UPCAST(IntelHDAState, pci, pci); IntelHDAState *d = DO_UPCAST(IntelHDAState, pci, pci);
if (d->msi) {
msi_uninit(&d->pci); msi_uninit(&d->pci);
}
cpu_unregister_io_memory(d->mmio_addr); cpu_unregister_io_memory(d->mmio_addr);
return 0; return 0;
} }

12
hw/msi.c
View file

@ -164,9 +164,17 @@ int msi_init(struct PCIDevice *dev, uint8_t offset,
void msi_uninit(struct PCIDevice *dev) void msi_uninit(struct PCIDevice *dev)
{ {
uint16_t flags = pci_get_word(dev->config + msi_flags_off(dev)); uint16_t flags;
uint8_t cap_size = msi_cap_sizeof(flags); uint8_t cap_size;
if (!(dev->cap_present & QEMU_PCI_CAP_MSI)) {
return;
}
flags = pci_get_word(dev->config + msi_flags_off(dev));
cap_size = msi_cap_sizeof(flags);
pci_del_capability(dev, PCI_CAP_ID_MSIX, cap_size); pci_del_capability(dev, PCI_CAP_ID_MSIX, cap_size);
dev->cap_present &= ~QEMU_PCI_CAP_MSI;
MSI_DEV_PRINTF(dev, "uninit\n"); MSI_DEV_PRINTF(dev, "uninit\n");
} }