From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=55049 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PD9Yt-0008Jp-Gf for qemu-devel@nongnu.org; Tue, 02 Nov 2010 01:37:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PD9Ys-0003JQ-Iq for qemu-devel@nongnu.org; Tue, 02 Nov 2010 01:37:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17518) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PD9Ys-0003JM-B6 for qemu-devel@nongnu.org; Tue, 02 Nov 2010 01:37:34 -0400 From: Alex Williamson Date: Mon, 01 Nov 2010 23:37:32 -0600 Message-ID: <20101102053727.10424.32902.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 1/3] msi: Allow pre-existing MSI capabilities 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 For use with device assignment, allow calling msi_init() on devices with MSI capability already configured. Signed-off-by: Alex Williamson --- 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;