From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O9hVo-0002cY-Ql for qemu-devel@nongnu.org; Wed, 05 May 2010 12:31:53 -0400 Received: from [140.186.70.92] (port=43948 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O9hVf-0001vY-0R for qemu-devel@nongnu.org; Wed, 05 May 2010 12:31:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O9hJP-00049J-RJ for qemu-devel@nongnu.org; Wed, 05 May 2010 12:19:05 -0400 Received: from demumfd002.nsn-inter.net ([93.183.12.31]:10452) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O9hJP-00048x-Eq for qemu-devel@nongnu.org; Wed, 05 May 2010 12:19:03 -0400 Received: from demuprx017.emea.nsn-intra.net ([10.150.129.56]) by demumfd002.nsn-inter.net (8.12.11.20060308/8.12.11) with ESMTP id o45GJ08C007767 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Wed, 5 May 2010 18:19:00 +0200 Received: from [10.148.23.89] ([10.148.23.89]) by demuprx017.emea.nsn-intra.net (8.12.11.20060308/8.12.11) with ESMTP id o45GJ0KX004581 for ; Wed, 5 May 2010 18:19:00 +0200 Message-ID: <4BE19A74.4090300@nsn.com> Date: Wed, 05 May 2010 18:19:00 +0200 From: Bernhard Kohl MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] msix: allow byte and word reading from mmio List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org It's legal that the guest reads a single byte or word from mmio. Signed-off-by: Bernhard Kohl --- hw/msix.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/hw/msix.c b/hw/msix.c index 2ca0900..773bbbd 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -117,10 +117,22 @@ static uint32_t msix_mmio_readl(void *opaque, target_phys_addr_t addr) return pci_get_long(page + offset); } -static uint32_t msix_mmio_read_unallowed(void *opaque, target_phys_addr_t addr) +static uint32_t msix_mmio_readw(void *opaque, target_phys_addr_t addr) { - fprintf(stderr, "MSI-X: only dword read is allowed!\n"); - return 0; + PCIDevice *dev = opaque; + unsigned int offset = addr & (MSIX_PAGE_SIZE - 1) & ~0x1; + void *page = dev->msix_table_page; + + return pci_get_word(page + offset); +} + +static uint32_t msix_mmio_readb(void *opaque, target_phys_addr_t addr) +{ + PCIDevice *dev = opaque; + unsigned int offset = addr & (MSIX_PAGE_SIZE - 1); + void *page = dev->msix_table_page; + + return pci_get_byte(page + offset); } static uint8_t msix_pending_mask(int vector) @@ -215,7 +227,7 @@ static CPUWriteMemoryFunc * const msix_mmio_write[] = { }; static CPUReadMemoryFunc * const msix_mmio_read[] = { - msix_mmio_read_unallowed, msix_mmio_read_unallowed, msix_mmio_readl + msix_mmio_readb, msix_mmio_readw, msix_mmio_readl }; /* Should be called from device's map method. */ -- 1.6.6.1