From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ob0-f173.google.com (mail-ob0-f173.google.com [209.85.214.173]) by dpdk.org (Postfix) with ESMTP id 2E1925A52 for ; Tue, 7 Jul 2015 10:04:34 +0200 (CEST) Received: by obbkm3 with SMTP id km3so123363761obb.1 for ; Tue, 07 Jul 2015 01:04:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=Cuzb3Y6B0aZXoGPSjU82Fce6p2JPZrBzBKKaeHCWUFQ=; b=FAhNOxbi8ncFwdpKGULdoSbQGJyEbC7sbIdZoHPyIW/v6R4+2Hg3rX45HyP2YVCYbP T6+MbbiXUWKggsoWggGv8HGz8KdrKD9nuAAgXTwIVoBHkLiwRX+vCqDsFP0FfkZ82RyY yJOGKk3sWwgKa/vnESwg4nYRXO5m7WmHWtmKQSU9hUggxgtBp4hmfNusTNG5PRfSu1fT h+zLqW1+RkgfZGOP5LrSwsaI13AZlZybSShhtyV/IhjbHD6RKoY/inqUX9yEyMaR4V1L MgQFHhLbZVkoADwexhyeB12ovkjGbFBFo1JEfzTunsXBmz9ts+mq0+4DKmx8wMtQjLAA 8wdA== X-Gm-Message-State: ALoCoQkFrvpQT0e4IKZGbjebseGZPKD1sFrrHl+yyPUtrcIQ0UIA4ea56t15aOE0gRTkAyqm2x0l MIME-Version: 1.0 X-Received: by 10.202.86.215 with SMTP id k206mr2657933oib.13.1436256273619; Tue, 07 Jul 2015 01:04:33 -0700 (PDT) Received: by 10.76.84.233 with HTTP; Tue, 7 Jul 2015 01:04:33 -0700 (PDT) In-Reply-To: <1436163861-3025-5-git-send-email-mukawa@igel.co.jp> References: <1435652668-3380-12-git-send-email-mukawa@igel.co.jp> <1436163861-3025-1-git-send-email-mukawa@igel.co.jp> <1436163861-3025-5-git-send-email-mukawa@igel.co.jp> Date: Tue, 7 Jul 2015 10:04:33 +0200 Message-ID: From: David Marchand To: Tetsuya Mukawa Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Cc: "dev@dpdk.org" Subject: Re: [dpdk-dev] [PATCH v8 04/12] eal/bsdapp: Change names of pci related data structure X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Jul 2015 08:04:34 -0000 On Mon, Jul 6, 2015 at 8:24 AM, Tetsuya Mukawa wrote: > From: "Tetsuya.Mukawa" > > To merge pci code of linuxapp and bsdapp, this patch changes names > like below. > - uio_map to pci_map > - uio_resource to mapped_pci_resource > - uio_res_list to mapped_pci_res_list > > Signed-off-by: Tetsuya Mukawa > --- > lib/librte_eal/bsdapp/eal/eal_pci.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c > b/lib/librte_eal/bsdapp/eal/eal_pci.c > index 63758c7..21d1e66 100644 > --- a/lib/librte_eal/bsdapp/eal/eal_pci.c > +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c > @@ -84,7 +84,7 @@ > * enabling bus master. > */ > > -struct uio_map { > +struct pci_map { > void *addr; > uint64_t offset; > uint64_t size; > @@ -95,16 +95,16 @@ struct uio_map { > * For multi-process we need to reproduce all PCI mappings in secondary > * processes, so save them in a tailq. > */ > -struct uio_resource { > - TAILQ_ENTRY(uio_resource) next; > +struct mapped_pci_resource { > + TAILQ_ENTRY(mapped_pci_resource) next; > > struct rte_pci_addr pci_addr; > char path[PATH_MAX]; > size_t nb_maps; > - struct uio_map maps[PCI_MAX_RESOURCE]; > + struct pci_map maps[PCI_MAX_RESOURCE]; > }; > > -TAILQ_HEAD(uio_res_list, uio_resource); > +TAILQ_HEAD(mapped_pci_res_list, mapped_pci_resource); > > static struct rte_tailq_elem rte_uio_tailq = { > .name = "UIO_RESOURCE_LIST", > @@ -163,9 +163,9 @@ static int > pci_uio_map_secondary(struct rte_pci_device *dev) > { > size_t i; > - struct uio_resource *uio_res; > - struct uio_res_list *uio_res_list = > - RTE_TAILQ_CAST(rte_uio_tailq.head, uio_res_list); > + struct mapped_pci_resource *uio_res; > + struct mapped_pci_res_list *uio_res_list = > + RTE_TAILQ_CAST(rte_uio_tailq.head, > mapped_pci_res_list); > > TAILQ_FOREACH(uio_res, uio_res_list, next) { > > @@ -202,10 +202,10 @@ pci_uio_map_resource(struct rte_pci_device *dev) > uint64_t offset; > uint64_t pagesz; > struct rte_pci_addr *loc = &dev->addr; > - struct uio_resource *uio_res = NULL; > - struct uio_res_list *uio_res_list = > - RTE_TAILQ_CAST(rte_uio_tailq.head, uio_res_list); > - struct uio_map *maps; > + struct mapped_pci_resource *uio_res = NULL; > + struct mapped_pci_res_list *uio_res_list = > + RTE_TAILQ_CAST(rte_uio_tailq.head, > mapped_pci_res_list); > + struct pci_map *maps; > > dev->intr_handle.fd = -1; > dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN; > -- > 2.1.4 > > Looks good to me. Acked-by: David Marchand -- David Marchand