For use with device assignment, allow calling msi_init() on devices with MSI capability already configured.
Signed-off-by: Alex Williamson <alex.william...@redhat.com> --- hw/msi.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/msi.c b/hw/msi.c index f03f519..0ad4e38 100644 --- a/hw/msi.c +++ b/hw/msi.c @@ -135,10 +135,16 @@ int msi_init(struct PCIDevice *dev, uint8_t offset, flags |= PCI_MSI_FLAGS_MASKBIT; } + config_offset = pci_find_capability(dev, PCI_CAP_ID_MSI); + cap_size = msi_cap_sizeof(flags); - config_offset = pci_add_capability(dev, PCI_CAP_ID_MSI, offset, cap_size); - if (config_offset < 0) { - return config_offset; + + if (!config_offset) { + config_offset = pci_add_capability(dev, PCI_CAP_ID_MSI, + offset, cap_size); + if (config_offset < 0) { + return config_offset; + } } dev->msi_cap = config_offset;