Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/16402/?format=api
http://patches.dpdk.org/api/patches/16402/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1475750063-16199-1-git-send-email-thomas.monjalon@6wind.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1475750063-16199-1-git-send-email-thomas.monjalon@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1475750063-16199-1-git-send-email-thomas.monjalon@6wind.com", "date": "2016-10-06T10:34:22", "name": "[dpdk-dev,1/2] app/test: fix vdev names", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "65cedcf4fe2435422b1a9a25cd42330876bebd9e", "submitter": { "id": 1, "url": "http://patches.dpdk.org/api/people/1/?format=api", "name": "Thomas Monjalon", "email": "thomas.monjalon@6wind.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1475750063-16199-1-git-send-email-thomas.monjalon@6wind.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/16402/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/16402/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 94ECA377C;\n\tThu, 6 Oct 2016 12:34:36 +0200 (CEST)", "from mail-wm0-f50.google.com (mail-wm0-f50.google.com\n\t[74.125.82.50]) by dpdk.org (Postfix) with ESMTP id 34A163238\n\tfor <dev@dpdk.org>; Thu, 6 Oct 2016 12:34:35 +0200 (CEST)", "by mail-wm0-f50.google.com with SMTP id k125so319384530wma.1\n\tfor <dev@dpdk.org>; Thu, 06 Oct 2016 03:34:35 -0700 (PDT)", "from XPS13.dev.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net.\n\t[82.239.227.177]) by smtp.gmail.com with ESMTPSA id\n\tt138sm34330497wmt.5.2016.10.06.03.34.32\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tThu, 06 Oct 2016 03:34:33 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id;\n\tbh=UY4wb0M1SkNRedlo7ZmLvm3BbZDEtgMqhtZrPAcx8hM=;\n\tb=2EKO7sCy7RwSQz25gJmalOwQLWrPwMpPsbv2Zw8FB+/L233opMfkPdCe0ASdDmYRDN\n\tn+hbAURlEh5CF9jE/q71mj69RyaFtSJK+fQSO1ZxRhIfJctjIf+uPjz+hUNG8FCy16Pb\n\tQNPDjbMw5QxmtKsV+DRbTiUPahQlZN6XQiS3tWjgtezuzRndmr0Oc3PerTXzfCaZGu2Z\n\tkzTzlNkAV8YCLDZ2ZcHJyFMBUo4NvepGwaLkU2ABmhsSffVISIFcekJoZD2L0hJ1gRY/\n\t+zhaeFO+Jlz+TuQ/yaSwj1K7XXzQhPRntSQ1pJug5lENFRQ62/+zgJKzDcYsNNxI3erN\n\tlFBA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id;\n\tbh=UY4wb0M1SkNRedlo7ZmLvm3BbZDEtgMqhtZrPAcx8hM=;\n\tb=Yq6xaGwU+3+lT9aZBR4SKyzcOtufLYhYBIzjaIT/0/b4v7Q3Qndy3odN9gotifW9YH\n\tsslV5n6EAN5W3ozUfZ6pJ2CsSZ0Fh45jFxfNoPt2pAuSNe/NbHJKlHH2YCMaaQriDWfZ\n\tUKKOqqhLF5b84eGrFTcIy0Dll6PbjIxkL7gYS8APU+hEuGo10Td/L6upf/hnnWgO7thW\n\t0KP46p0sLfHCJ7V0Qfg4JWpm5F2CRl01Vj8HvuX7UXn5l6kbLVy30wJOzRoqYbd/ThC8\n\tYYJ+jIOtL5q1rYhxBb7MwkUPR1FHGiVDJXv7SuYHt5FrpYySoDPnu8gYdjgJjqYMa7Cn\n\t8ALw==", "X-Gm-Message-State": "AA6/9Rlm+TgzeWnj7bKPhIAURc2wvdt4kcAZHtlyIYQeWwd0099lbY/ovTE8Q+c6l1xk8Gzq", "X-Received": "by 10.194.118.131 with SMTP id\n\tkm3mr11417958wjb.173.1475750074734; \n\tThu, 06 Oct 2016 03:34:34 -0700 (PDT)", "From": "Thomas Monjalon <thomas.monjalon@6wind.com>", "To": "pablo.de.lara.guarch@intel.com", "Cc": "dev@dpdk.org", "Date": "Thu, 6 Oct 2016 12:34:22 +0200", "Message-Id": "<1475750063-16199-1-git-send-email-thomas.monjalon@6wind.com>", "X-Mailer": "git-send-email 2.7.0", "Subject": "[dpdk-dev] [PATCH 1/2] app/test: fix vdev names", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The vdev eth_ring has been renamed to net_ring.\nSome unit tests are using the old name and fail.\n\nFixes also the vdev comments in EAL and ethdev.\n\nFixes: 2f45703c17ac (\"drivers: make driver names consistent\")\n\nSigned-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>\n---\n app/test/test_devargs.c | 8 ++++----\n app/test/test_eal_flags.c | 6 +++---\n app/test/test_pmd_ring.c | 14 +++++++-------\n doc/guides/contributing/documentation.rst | 4 ++--\n doc/guides/prog_guide/port_hotplug_framework.rst | 2 +-\n lib/librte_eal/common/eal_common_options.c | 2 +-\n lib/librte_eal/common/eal_common_vdev.c | 4 ++--\n lib/librte_eal/common/include/rte_devargs.h | 8 ++++----\n lib/librte_ether/rte_ethdev.h | 4 ++--\n 9 files changed, 26 insertions(+), 26 deletions(-)", "diff": "diff --git a/app/test/test_devargs.c b/app/test/test_devargs.c\nindex 151ac2a..63242f1 100644\n--- a/app/test/test_devargs.c\n+++ b/app/test/test_devargs.c\n@@ -78,19 +78,19 @@ test_devargs(void)\n \t\tgoto fail;\n \tif (rte_eal_devargs_type_count(RTE_DEVTYPE_VIRTUAL) != 0)\n \t\tgoto fail;\n-\tif (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, \"eth_ring0\") < 0)\n+\tif (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, \"net_ring0\") < 0)\n \t\tgoto fail;\n-\tif (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, \"eth_ring1,key=val,k2=val2\") < 0)\n+\tif (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, \"net_ring1,key=val,k2=val2\") < 0)\n \t\tgoto fail;\n \tif (rte_eal_devargs_type_count(RTE_DEVTYPE_VIRTUAL) != 2)\n \t\tgoto fail;\n \tfree_devargs_list();\n \n \t/* check virtual device with argument parsing */\n-\tif (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, \"eth_ring1,k1=val,k2=val2\") < 0)\n+\tif (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, \"net_ring1,k1=val,k2=val2\") < 0)\n \t\tgoto fail;\n \tdevargs = TAILQ_FIRST(&devargs_list);\n-\tif (strncmp(devargs->virt.drv_name, \"eth_ring1\",\n+\tif (strncmp(devargs->virt.drv_name, \"net_ring1\",\n \t\t\tsizeof(devargs->virt.drv_name)) != 0)\n \t\tgoto fail;\n \tif (!devargs->args || strcmp(devargs->args, \"k1=val,k2=val2\") != 0)\ndiff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c\nindex 6202f05..91b4066 100644\n--- a/app/test/test_eal_flags.c\n+++ b/app/test/test_eal_flags.c\n@@ -414,13 +414,13 @@ test_invalid_vdev_flag(void)\n \n \t/* Test with valid vdev option */\n \tconst char *vdevval1[] = {prgname, prefix, \"-n\", \"1\",\n-\t\"-c\", \"1\", vdev, \"eth_ring0\"};\n+\t\"-c\", \"1\", vdev, \"net_ring0\"};\n \n \tconst char *vdevval2[] = {prgname, prefix, \"-n\", \"1\",\n-\t\"-c\", \"1\", vdev, \"eth_ring0,args=test\"};\n+\t\"-c\", \"1\", vdev, \"net_ring0,args=test\"};\n \n \tconst char *vdevval3[] = {prgname, prefix, \"-n\", \"1\",\n-\t\"-c\", \"1\", vdev, \"eth_ring0,nodeaction=r1:0:CREATE\"};\n+\t\"-c\", \"1\", vdev, \"net_ring0,nodeaction=r1:0:CREATE\"};\n \n \tif (launch_proc(vdevinval) == 0) {\n \t\tprintf(\"Error - process did run ok with invalid \"\ndiff --git a/app/test/test_pmd_ring.c b/app/test/test_pmd_ring.c\nindex 47374db..2cdf60d 100644\n--- a/app/test/test_pmd_ring.c\n+++ b/app/test/test_pmd_ring.c\n@@ -434,7 +434,7 @@ test_pmd_ring(void)\n \t/* create the rings and eth_rings in the test code.\n \t * This does not test the rte_pmd_ring_devinit function.\n \t *\n-\t * Test with the command line option --vdev=eth_ring0 to test rte_pmd_ring_devinit.\n+\t * Test with the command line option --vdev=net_ring0 to test rte_pmd_ring_devinit.\n \t */\n \trxtx[0] = rte_ring_create(\"R0\", RING_SIZE, SOCKET0, RING_F_SP_ENQ|RING_F_SC_DEQ);\n \tif (rxtx[0] == NULL) {\n@@ -448,11 +448,11 @@ test_pmd_ring(void)\n \t\treturn -1;\n \t}\n \n-\ttx_porta = rte_eth_from_rings(\"eth_ringa\", rxtx, NUM_RINGS, rxtx, NUM_RINGS, SOCKET0);\n-\trx_portb = rte_eth_from_rings(\"eth_ringb\", rxtx, NUM_RINGS, rxtx, NUM_RINGS, SOCKET0);\n-\trxtx_portc = rte_eth_from_rings(\"eth_ringc\", rxtx, NUM_RINGS, rxtx, NUM_RINGS, SOCKET0);\n-\trxtx_portd = rte_eth_from_rings(\"eth_ringd\", rxtx, NUM_RINGS, rxtx, NUM_RINGS, SOCKET0);\n-\trxtx_porte = rte_eth_from_rings(\"eth_ringe\", rxtx, NUM_RINGS, rxtx, NUM_RINGS, SOCKET0);\n+\ttx_porta = rte_eth_from_rings(\"net_ringa\", rxtx, NUM_RINGS, rxtx, NUM_RINGS, SOCKET0);\n+\trx_portb = rte_eth_from_rings(\"net_ringb\", rxtx, NUM_RINGS, rxtx, NUM_RINGS, SOCKET0);\n+\trxtx_portc = rte_eth_from_rings(\"net_ringc\", rxtx, NUM_RINGS, rxtx, NUM_RINGS, SOCKET0);\n+\trxtx_portd = rte_eth_from_rings(\"net_ringd\", rxtx, NUM_RINGS, rxtx, NUM_RINGS, SOCKET0);\n+\trxtx_porte = rte_eth_from_rings(\"net_ringe\", rxtx, NUM_RINGS, rxtx, NUM_RINGS, SOCKET0);\n \n \tprintf(\"tx_porta=%d rx_portb=%d rxtx_portc=%d rxtx_portd=%d rxtx_porte=%d\\n\",\n \t\t\ttx_porta, rx_portb, rxtx_portc, rxtx_portd, rxtx_porte);\n@@ -501,7 +501,7 @@ test_pmd_ring(void)\n \tif (test_pmd_ring_pair_create_attach(rxtx_portd, rxtx_porte) < 0)\n \t\treturn -1;\n \n-\t/* find a port created with the --vdev=eth_ring0 command line option */\n+\t/* find a port created with the --vdev=net_ring0 command line option */\n \tfor (port = 0; port < nb_ports; port++) {\n \t\tstruct rte_eth_dev_info dev_info;\n \ndiff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst\nindex b2cc903..6d4c277 100644\n--- a/doc/guides/contributing/documentation.rst\n+++ b/doc/guides/contributing/documentation.rst\n@@ -631,7 +631,7 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati\n * @param devargs\n * A pointer to a strings array describing the new device\n * to be attached. The strings should be a pci address like\n- * `0000:01:00.0` or **virtual** device name like `eth_pcap0`.\n+ * `0000:01:00.0` or **virtual** device name like `net_pcap0`.\n * @param port_id\n * A pointer to a port identifier actually attached.\n *\n@@ -643,7 +643,7 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati\n * Doxygen supports Markdown style syntax such as bold, italics, fixed width text and lists.\n For example the second line in the ``devargs`` parameter in the previous example will be rendered as:\n \n- The strings should be a pci address like ``0000:01:00.0`` or **virtual** device name like ``eth_pcap0``.\n+ The strings should be a pci address like ``0000:01:00.0`` or **virtual** device name like ``net_pcap0``.\n \n * Use ``-`` instead of ``*`` for lists within the Doxygen comment since the latter can get confused with the comment delimiter.\n \ndiff --git a/doc/guides/prog_guide/port_hotplug_framework.rst b/doc/guides/prog_guide/port_hotplug_framework.rst\nindex fe6d72a..6e4436e 100644\n--- a/doc/guides/prog_guide/port_hotplug_framework.rst\n+++ b/doc/guides/prog_guide/port_hotplug_framework.rst\n@@ -80,7 +80,7 @@ Port Hotplug API overview\n returns the attached port number. Before calling the API, the device\n should be recognized by an userspace driver I/O framework. The API\n receives a pci address like \"0000:01:00.0\" or a virtual device name\n- like \"eth_pcap0,iface=eth0\". In the case of virtual device name, the\n+ like \"net_pcap0,iface=eth0\". In the case of virtual device name, the\n format is the same as the general \"--vdev\" option of DPDK.\n \n * Detaching a port\ndiff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c\nindex 1a1bab3..6ca8af1 100644\n--- a/lib/librte_eal/common/eal_common_options.c\n+++ b/lib/librte_eal/common/eal_common_options.c\n@@ -1021,7 +1021,7 @@ eal_common_usage(void)\n \t \" [NOTE: PCI whitelist cannot be used with -b option]\\n\"\n \t \" --\"OPT_VDEV\" Add a virtual device.\\n\"\n \t \" The argument format is <driver><id>[,key=val,...]\\n\"\n-\t \" (ex: --vdev=eth_pcap0,iface=eth2).\\n\"\n+\t \" (ex: --vdev=net_pcap0,iface=eth2).\\n\"\n \t \" -d LIB.so|DIR Add a driver or driver directory\\n\"\n \t \" (can be used multiple times)\\n\"\n \t \" --\"OPT_VMWARE_TSC_MAP\" Use VMware TSC map instead of native RDTSC\\n\"\ndiff --git a/lib/librte_eal/common/eal_common_vdev.c b/lib/librte_eal/common/eal_common_vdev.c\nindex 6dab782..1956bed 100644\n--- a/lib/librte_eal/common/eal_common_vdev.c\n+++ b/lib/librte_eal/common/eal_common_vdev.c\n@@ -71,7 +71,7 @@ rte_eal_vdev_init(const char *name, const char *args)\n \t\t/*\n \t\t * search a driver prefix in virtual device name.\n \t\t * For example, if the driver is pcap PMD, driver->name\n-\t\t * will be \"eth_pcap\", but \"name\" will be \"eth_pcapN\".\n+\t\t * will be \"net_pcap\", but \"name\" will be \"net_pcapN\".\n \t\t * So use strncmp to compare.\n \t\t */\n \t\tif (!strncmp(driver->driver.name, name,\n@@ -95,7 +95,7 @@ rte_eal_vdev_uninit(const char *name)\n \t\t/*\n \t\t * search a driver prefix in virtual device name.\n \t\t * For example, if the driver is pcap PMD, driver->name\n-\t\t * will be \"eth_pcap\", but \"name\" will be \"eth_pcapN\".\n+\t\t * will be \"net_pcap\", but \"name\" will be \"net_pcapN\".\n \t\t * So use strncmp to compare.\n \t\t */\n \t\tif (!strncmp(driver->driver.name, name,\ndiff --git a/lib/librte_eal/common/include/rte_devargs.h b/lib/librte_eal/common/include/rte_devargs.h\nindex c66895f..88120a1 100644\n--- a/lib/librte_eal/common/include/rte_devargs.h\n+++ b/lib/librte_eal/common/include/rte_devargs.h\n@@ -107,8 +107,8 @@ extern struct rte_devargs_list devargs_list;\n * \"04:00.0,arg=val\".\n *\n * For virtual devices, the format of arguments string is \"DRIVER_NAME*\"\n- * or \"DRIVER_NAME*,key=val,key2=val2,...\". Examples: \"eth_ring\",\n- * \"eth_ring0\", \"eth_pmdAnything,arg=0:arg2=1\".\n+ * or \"DRIVER_NAME*,key=val,key2=val2,...\". Examples: \"net_ring\",\n+ * \"net_ring0\", \"net_pmdAnything,arg=0:arg2=1\".\n *\n * The function parses the arguments string to get driver name and driver\n * arguments.\n@@ -135,8 +135,8 @@ int rte_eal_parse_devargs_str(const char *devargs_str,\n * \"04:00.0,arg=val\".\n *\n * For virtual devices, the format of arguments string is \"DRIVER_NAME*\"\n- * or \"DRIVER_NAME*,key=val,key2=val2,...\". Examples: \"eth_ring\",\n- * \"eth_ring0\", \"eth_pmdAnything,arg=0:arg2=1\". The validity of the\n+ * or \"DRIVER_NAME*,key=val,key2=val2,...\". Examples: \"net_ring\",\n+ * \"net_ring0\", \"net_pmdAnything,arg=0:arg2=1\". The validity of the\n * driver name is not checked by this function, it is done when probing\n * the drivers.\n *\ndiff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h\nindex 7218b6f..5540ecd 100644\n--- a/lib/librte_ether/rte_ethdev.h\n+++ b/lib/librte_ether/rte_ethdev.h\n@@ -1767,7 +1767,7 @@ int rte_eth_dev_release_port(struct rte_eth_dev *eth_dev);\n * @param devargs\n * A pointer to a strings array describing the new device\n * to be attached. The strings should be a pci address like\n- * '0000:01:00.0' or virtual device name like 'eth_pcap0'.\n+ * '0000:01:00.0' or virtual device name like 'net_pcap0'.\n * @param port_id\n * A pointer to a port identifier actually attached.\n * @return\n@@ -4320,7 +4320,7 @@ rte_eth_dev_l2_tunnel_offload_set(uint8_t port_id,\n \n /**\n * Get the port id from pci adrress or device name\n-* Ex: 0000:2:00.0 or vdev name eth_pcap0\n+* Ex: 0000:2:00.0 or vdev name net_pcap0\n *\n * @param name\n * pci address or name of the device\n", "prefixes": [ "dpdk-dev", "1/2" ] }{ "id": 16402, "url": "