| Message ID | 4DBEF14F.3010505@siemens.com |
|---|---|
| State | New |
| Headers | show |
On 02.05.2011, at 20:00, Jan Kiszka wrote: > 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> Looks good to me. Acked-by: Alexander Graf <agraf@suse.de> Alex
On Mon, May 02, 2011 at 08:00:47PM +0200, Jan Kiszka wrote: > 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> Applied, thanks! > --- > hw/ide/ich.c | 5 +---- > hw/intel-hda.c | 4 +--- > hw/msi.c | 12 ++++++++++-- > 3 files changed, 12 insertions(+), 9 deletions(-) > > v2: Push cap check into msi_uninit (just like msix), remove check from > users. > > diff --git a/hw/ide/ich.c b/hw/ide/ich.c > index a3d475c..8c1ff6c 100644 > --- a/hw/ide/ich.c > +++ b/hw/ide/ich.c > @@ -110,10 +110,7 @@ static int pci_ich9_uninit(PCIDevice *dev) > struct AHCIPCIState *d; > d = DO_UPCAST(struct AHCIPCIState, card, dev); > > - if (msi_enabled(dev)) { > - msi_uninit(dev); > - } > - > + msi_uninit(dev); > qemu_unregister_reset(ahci_reset, d); > ahci_uninit(&d->ahci); > > diff --git a/hw/intel-hda.c b/hw/intel-hda.c > index b0b1d12..093c4b9 100644 > --- a/hw/intel-hda.c > +++ b/hw/intel-hda.c > @@ -1174,9 +1174,7 @@ static int intel_hda_exit(PCIDevice *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); > return 0; > } > diff --git a/hw/msi.c b/hw/msi.c > index 0cbf89f..3141804 100644 > --- a/hw/msi.c > +++ b/hw/msi.c > @@ -183,9 +183,17 @@ 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); > + uint16_t 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); > + dev->cap_present &= ~QEMU_PCI_CAP_MSI; > + > MSI_DEV_PRINTF(dev, "uninit\n"); > } > > -- > 1.7.1
diff --git a/hw/ide/ich.c b/hw/ide/ich.c index a3d475c..8c1ff6c 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -110,10 +110,7 @@ static int pci_ich9_uninit(PCIDevice *dev) struct AHCIPCIState *d; d = DO_UPCAST(struct AHCIPCIState, card, dev); - if (msi_enabled(dev)) { - msi_uninit(dev); - } - + msi_uninit(dev); qemu_unregister_reset(ahci_reset, d); ahci_uninit(&d->ahci); diff --git a/hw/intel-hda.c b/hw/intel-hda.c index b0b1d12..093c4b9 100644 --- a/hw/intel-hda.c +++ b/hw/intel-hda.c @@ -1174,9 +1174,7 @@ static int intel_hda_exit(PCIDevice *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); return 0; } diff --git a/hw/msi.c b/hw/msi.c index 0cbf89f..3141804 100644 --- a/hw/msi.c +++ b/hw/msi.c @@ -183,9 +183,17 @@ 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); + uint16_t 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); + dev->cap_present &= ~QEMU_PCI_CAP_MSI; + MSI_DEV_PRINTF(dev, "uninit\n"); }
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> --- hw/ide/ich.c | 5 +---- hw/intel-hda.c | 4 +--- hw/msi.c | 12 ++++++++++-- 3 files changed, 12 insertions(+), 9 deletions(-) v2: Push cap check into msi_uninit (just like msix), remove check from users.