From eebcb0a76a7e8b093740c9bd3db00f5b38e79a33 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Thu, 14 Jun 2012 12:16:19 -0600 Subject: [PATCH] msix: Move msix_mmio_read What's this doing so far from msix_mmio_ops? Signed-off-by: Alex Williamson Signed-off-by: Michael S. Tsirkin --- hw/msix.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/msix.c b/hw/msix.c index bafea94084..50885acb91 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) {