From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfEao-0005IY-Lz for qemu-devel@nongnu.org; Thu, 14 Jun 2012 14:16:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SfEam-0007kv-0k for qemu-devel@nongnu.org; Thu, 14 Jun 2012 14:16:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62755) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfEal-0007kh-OG for qemu-devel@nongnu.org; Thu, 14 Jun 2012 14:16:23 -0400 From: Alex Williamson Date: Thu, 14 Jun 2012 12:16:19 -0600 Message-ID: <20120614181618.23440.82571.stgit@bling.home> In-Reply-To: <20120614181104.23440.62204.stgit@bling.home> References: <20120614181104.23440.62204.stgit@bling.home> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v3 4/8] msix: Move msix_mmio_read List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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) {