From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by dpdk.org (Postfix) with ESMTP id 1CBBB68E8 for ; Sun, 2 Mar 2014 22:50:20 +0100 (CET) Received: by mail-wi0-f176.google.com with SMTP id hi5so2602243wib.3 for ; Sun, 02 Mar 2014 13:51:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=YRQ+Rr9nkAve6oaq784WgRVA9LAcT2Dzo3YTiY9TF9o=; b=BjP/4tFzQOOBZSDljVDVyMbL9afF6ghhl+LxbEGb/xnvIo9ynl+EQ2hu04EHlYml8w E9RzuV1rS88qaQii5FuIGt0Lmj2QrlAcgl9LCazpex1mi3cu1mO2YXNHh9lwjWXw6pHa i2bRIEBPScc1YZNnnC92rXyzdy5os0b+r7xZt3cx/Bjrn3Ea1Nmv7wQs5MMZU7papDZt nwfhf8DVdIaeRVWXRVMZuFZQjnZXu5BGo4HFDWKhxgS6GWLdbW5excalIzqdUEyRXIdr +7pTQd3BXqT4TFETVziZAYdWFW4YdD3lOEtuZyyvxHc0JPDwSy2P3zKipsE9R7nHsREY oe5Q== X-Gm-Message-State: ALoCoQl5R3wG7Q1C0rxVbUewzWU6eXeGu5YFdX+72G9AmR0MrS8sHum4ltEWr6OtwIzTvtsmc3K7 X-Received: by 10.194.200.40 with SMTP id jp8mr3763318wjc.51.1393797108230; Sun, 02 Mar 2014 13:51:48 -0800 (PST) Received: from glumotte.dev.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by mx.google.com with ESMTPSA id r3sm23860960wjw.0.2014.03.02.13.51.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 02 Mar 2014 13:51:47 -0800 (PST) From: Olivier Matz To: dev@dpdk.org Date: Sun, 2 Mar 2014 22:51:28 +0100 Message-Id: <1393797088-25730-1-git-send-email-olivier.matz@6wind.com> X-Mailer: git-send-email 1.8.5.3 Cc: mirots@gmail.com Subject: [dpdk-dev] [PATCH] pcap: fix compilation error introduced by kvargs 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: Sun, 02 Mar 2014 21:50:21 -0000 Due to a merge conflict between commits 4c745617a1 and 9d5752d80, rte_eth_pcap.c was not compiling with the following error: rte_eth_pcap.c: In function 'rte_pmd_init_internals': rte_eth_pcap.c:559:30: error: dereferencing pointer to incomplete type rte_eth_pcap.c:560:15: error: dereferencing pointer to incomplete type rte_eth_pcap.c:561:18: error: dereferencing pointer to incomplete type rte_eth_pcap.c:603:47: error: dereferencing pointer to incomplete type rte_eth_pcap.c: In function 'rte_pmd_pcap_init': rte_eth_pcap.c:732:73: error: 'dict' undeclared (first use in this function) rte_eth_pcap.c:732:73: note: each undeclared identifier is reported only once for each function it appears in This commit replaces "struct args_dict" by "struct rte_kvargs" to fix the compilation issue. By the way, it also removes the declaration of these functions from the header file as no other file in DPDK references one of them. It avoids to include in rte_eth_pcap.h. Pointed-out-by: Meir Tseitlin Signed-off-by: Olivier Matz --- lib/librte_pmd_pcap/rte_eth_pcap.c | 27 ++++++++++++++------------- lib/librte_pmd_pcap/rte_eth_pcap.h | 17 ----------------- 2 files changed, 14 insertions(+), 30 deletions(-) diff --git a/lib/librte_pmd_pcap/rte_eth_pcap.c b/lib/librte_pmd_pcap/rte_eth_pcap.c index 03e6e6c..fbafd19 100644 --- a/lib/librte_pmd_pcap/rte_eth_pcap.c +++ b/lib/librte_pmd_pcap/rte_eth_pcap.c @@ -549,15 +549,15 @@ rte_pmd_init_internals(const unsigned nb_rx_queues, const unsigned numa_node, struct pmd_internals **internals, struct rte_eth_dev **eth_dev, - struct args_dict *dict) + struct rte_kvargs *kvlist) { struct rte_eth_dev_data *data = NULL; struct rte_pci_device *pci_dev = NULL; unsigned k_idx; - struct key_value *pair = NULL; + struct rte_kvargs_pair *pair = NULL; - for (k_idx = 0; k_idx < dict->index; k_idx++) { - pair = &dict->pairs[k_idx]; + for (k_idx = 0; k_idx < kvlist->count; k_idx++) { + pair = &kvlist->pairs[k_idx]; if (strstr(pair->key, ETH_PCAP_IFACE_ARG) != NULL) break; } @@ -626,13 +626,13 @@ rte_pmd_init_internals(const unsigned nb_rx_queues, return -1; } -int +static int rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], const unsigned nb_rx_queues, pcap_dumper_t * const tx_queues[], const unsigned nb_tx_queues, const unsigned numa_node, - struct args_dict *dict) + struct rte_kvargs *kvlist) { struct pmd_internals *internals = NULL; struct rte_eth_dev *eth_dev = NULL; @@ -645,7 +645,7 @@ rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], return -1; if (rte_pmd_init_internals(nb_rx_queues, nb_tx_queues, numa_node, - &internals, ð_dev, dict) < 0) + &internals, ð_dev, kvlist) < 0) return -1; for (i = 0; i < nb_rx_queues; i++) { @@ -661,13 +661,13 @@ rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], return 0; } -int +static int rte_eth_from_pcaps(pcap_t * const rx_queues[], const unsigned nb_rx_queues, pcap_t * const tx_queues[], const unsigned nb_tx_queues, const unsigned numa_node, - struct args_dict *dict) + struct rte_kvargs *kvlist) { struct pmd_internals *internals = NULL; struct rte_eth_dev *eth_dev = NULL; @@ -680,7 +680,7 @@ rte_eth_from_pcaps(pcap_t * const rx_queues[], return -1; if (rte_pmd_init_internals(nb_rx_queues, nb_tx_queues, numa_node, - &internals, ð_dev, dict) < 0) + &internals, ð_dev, kvlist) < 0) return -1; for (i = 0; i < nb_rx_queues; i++) { @@ -729,7 +729,8 @@ rte_pmd_pcap_init(const char *name, const char *params) if (ret < 0) return -1; - return rte_eth_from_pcaps(pcaps.pcaps, 1, pcaps.pcaps, 1, numa_node, &dict); + return rte_eth_from_pcaps(pcaps.pcaps, 1, pcaps.pcaps, 1, + numa_node, kvlist); } /* @@ -770,10 +771,10 @@ rte_pmd_pcap_init(const char *name, const char *params) if (using_dumpers) return rte_eth_from_pcaps_n_dumpers(pcaps.pcaps, pcaps.num_of_rx, - dumpers.dumpers, dumpers.num_of_tx, numa_node, &dict); + dumpers.dumpers, dumpers.num_of_tx, numa_node, kvlist); return rte_eth_from_pcaps(pcaps.pcaps, pcaps.num_of_rx, dumpers.pcaps, - dumpers.num_of_tx, numa_node, &dict); + dumpers.num_of_tx, numa_node, kvlist); } diff --git a/lib/librte_pmd_pcap/rte_eth_pcap.h b/lib/librte_pmd_pcap/rte_eth_pcap.h index c0bc5d8..344b78d 100644 --- a/lib/librte_pmd_pcap/rte_eth_pcap.h +++ b/lib/librte_pmd_pcap/rte_eth_pcap.h @@ -47,23 +47,6 @@ extern "C" { #define RTE_ETH_PCAP_PARAM_NAME "eth_pcap" -/* struct args_dict is declared in rte_eth_pcap_args_parser.h */ -struct args_dict; - -int rte_eth_from_pcaps(pcap_t * const rx_queues[], - const unsigned nb_rx_queues, - pcap_t * const tx_queues[], - const unsigned nb_tx_queues, - const unsigned numa_node, - struct args_dict *dict); - -int rte_eth_from_pcaps_n_dumpers(pcap_t * const rx_queues[], - const unsigned nb_rx_queues, - pcap_dumper_t * const tx_queues[], - const unsigned nb_tx_queues, - const unsigned numa_node, - struct args_dict *dict); - /** * For use by the EAL only. Called as part of EAL init to set up any dummy NICs * configured on command line. -- 1.8.5.3