From patchwork Thu Jun 14 18:16:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3,4/8] msix: Move msix_mmio_read Date: Thu, 14 Jun 2012 08:16:19 -0000 From: Alex Williamson X-Patchwork-Id: 164990 Message-Id: <20120614181618.23440.82571.stgit@bling.home> To: mst@redhat.com Cc: jan.kiszka@siemens.com, qemu-devel@nongnu.org What's this doing so far from msix_mmio_ops? Signed-off-by: Alex Williamson --- hw/msix.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/msix.c b/hw/msix.c index bafea94..50885ac 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -86,16 +86,6 @@ static int msix_add_config(struct PCIDevice *pdev, unsigned short nentries, return 0; } -static uint64_t msix_mmio_read(void *opaque, target_phys_addr_t addr, - unsigned size) -{ - PCIDevice *dev = opaque; - unsigned int offset = addr & (MSIX_PAGE_SIZE - 1) & ~0x3; - void *page = dev->msix_table_page; - - return pci_get_long(page + offset); -} - static uint8_t msix_pending_mask(int vector) { return 1 << (vector % 8); @@ -203,6 +193,16 @@ void msix_write_config(PCIDevice *dev, uint32_t addr, } } +static uint64_t msix_mmio_read(void *opaque, target_phys_addr_t addr, + unsigned size) +{ + PCIDevice *dev = opaque; + unsigned int offset = addr & (MSIX_PAGE_SIZE - 1) & ~0x3; + void *page = dev->msix_table_page; + + return pci_get_long(page + offset); +} + static void msix_mmio_write(void *opaque, target_phys_addr_t addr, uint64_t val, unsigned size) {