From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sf37p-0000fh-8W for qemu-devel@nongnu.org; Thu, 14 Jun 2012 02:01:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sf37n-0001dh-HN for qemu-devel@nongnu.org; Thu, 14 Jun 2012 02:01:44 -0400 Received: from goliath.siemens.de ([192.35.17.28]:32936) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sf37n-0001dc-7j for qemu-devel@nongnu.org; Thu, 14 Jun 2012 02:01:43 -0400 Message-ID: <4FD97E43.1060905@siemens.com> Date: Thu, 14 Jun 2012 08:01:39 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <20120614044751.11034.87619.stgit@bling.home> <20120614045127.11034.9983.stgit@bling.home> In-Reply-To: <20120614045127.11034.9983.stgit@bling.home> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 2/6] ivshmem: Convert to msix_init_exclusive_bar() interface List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex Williamson Cc: "qemu-devel@nongnu.org" , "mst@redhat.com" On 2012-06-14 06:51, Alex Williamson wrote: > Trivial conversion, failed to have an uninit before and after. Need not be in this series, but we should fix that trivial bug nevertheless. Jan > > Signed-off-by: Alex Williamson > --- > > hw/ivshmem.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/hw/ivshmem.c b/hw/ivshmem.c > index 05559b6..8b49eee 100644 > --- a/hw/ivshmem.c > +++ b/hw/ivshmem.c > @@ -70,7 +70,6 @@ typedef struct IVShmemState { > */ > MemoryRegion bar; > MemoryRegion ivshmem; > - MemoryRegion msix_bar; > uint64_t ivshmem_size; /* size of shared memory region */ > int shm_fd; /* shared memory file descriptor */ > > @@ -563,16 +562,13 @@ static uint64_t ivshmem_get_size(IVShmemState * s) { > > static void ivshmem_setup_msi(IVShmemState * s) > { > - memory_region_init(&s->msix_bar, "ivshmem-msix", 4096); > - if (!msix_init(&s->dev, s->vectors, &s->msix_bar, 1, 0)) { > - pci_register_bar(&s->dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY, > - &s->msix_bar); > - IVSHMEM_DPRINTF("msix initialized (%d vectors)\n", s->vectors); > - } else { > + if (msix_init_exclusive_bar(&s->dev, s->vectors, 1)) { > IVSHMEM_DPRINTF("msix initialization failed\n"); > exit(1); > } > > + IVSHMEM_DPRINTF("msix initialized (%d vectors)\n", s->vectors); > + > /* allocate QEMU char devices for receiving interrupts */ > s->eventfd_table = g_malloc0(s->vectors * sizeof(EventfdEntry)); > > -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux