Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 26284,
    "url": "http://patches.dpdk.org/api/patches/26284/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/3331659a85270eef374f7d491216ededea4e6c88.1499127915.git.gaetan.rivet@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": "<3331659a85270eef374f7d491216ededea4e6c88.1499127915.git.gaetan.rivet@6wind.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/3331659a85270eef374f7d491216ededea4e6c88.1499127915.git.gaetan.rivet@6wind.com",
    "date": "2017-07-04T00:58:33",
    "name": "[dpdk-dev,v6,6/6] devargs: parse bus info",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "622ff84eb5adb20c7f25c01dcad7a44886ec291f",
    "submitter": {
        "id": 269,
        "url": "http://patches.dpdk.org/api/people/269/?format=api",
        "name": "Gaëtan Rivet",
        "email": "gaetan.rivet@6wind.com"
    },
    "delegate": null,
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/3331659a85270eef374f7d491216ededea4e6c88.1499127915.git.gaetan.rivet@6wind.com/mbox/",
    "series": [],
    "comments": "http://patches.dpdk.org/api/patches/26284/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/26284/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 83EF05A98;\n\tTue,  4 Jul 2017 02:58:59 +0200 (CEST)",
            "from mail-wm0-f52.google.com (mail-wm0-f52.google.com\n\t[74.125.82.52]) by dpdk.org (Postfix) with ESMTP id CE67B5699\n\tfor <dev@dpdk.org>; Tue,  4 Jul 2017 02:58:53 +0200 (CEST)",
            "by mail-wm0-f52.google.com with SMTP id 62so182077352wmw.1\n\tfor <dev@dpdk.org>; Mon, 03 Jul 2017 17:58:53 -0700 (PDT)",
            "from bidouze.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com.\n\t[62.23.145.78]) by smtp.gmail.com with ESMTPSA id\n\tn189sm15162731wmd.0.2017.07.03.17.58.52\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tMon, 03 Jul 2017 17:58:52 -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:in-reply-to:references\n\t:in-reply-to:references;\n\tbh=WO/mRzdcW2WnmSnRPW82thr8PKLRBzXyhrS7W8GF6U8=;\n\tb=jeydBsJsIrT48c0hX+IXpWdBwDa9VO/u4QcPOWDNgob8W4Q2zVKFDAvf8yf2rfXTsj\n\tbQyOuSx5LpPY+U0QBojWB8L+CGP2q5a3lKJVajGdQIZn+8BKYDSSuykAqMrXgbwhosR9\n\tWXY6Ri8y3mRR6IbM+TEXlTUb9tKazSShacSFzqe2uJV/AHWbQW5X8CV9fnmh6V7Xxsur\n\tPoTmhLiRX+82l9HBgelKUqBYDeHMKQZ0T14nnxEYSJ24HtweejZUDTTYuJwOn4KFsotS\n\tD96p5/UD1ECixZFhNXai593W8XxgPLnvH0/5Bj5L7hneu9XT0YWzSjM9720VLUSkkm5J\n\tN6wg==",
        "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:in-reply-to:references;\n\tbh=WO/mRzdcW2WnmSnRPW82thr8PKLRBzXyhrS7W8GF6U8=;\n\tb=f9uwjznmyxWSS1S08tzlQCydD4ttWocRQij9g4gPARXvRGUeApGeLwAdJduUSJhWx7\n\tDYTPofQxZBXniBhFjScIlfsL+JCEU0DdkjRXgeughW5MtYesu4EjjjSPye+xYH+ykcpv\n\tepeq9eXsffM5rA0ZeHfP4TInFRXBMBTyxQhXGjD5QN6jQdzq/5YBoI237kvdxJVSoTxc\n\tRnIfUCtSmT47UR/IfKdlIlyX1CxTprCVgNpeLW6jg/fAjkQYaw6qOOBJSgbKQmjc4KhN\n\tIazvHWYvZNTFo5ZzlYzlemiW4vo49YgNkWpGaLUWbTqCL9TgpGHYgTIZHKJGYA2crMUL\n\tmgTA==",
        "X-Gm-Message-State": "AKS2vOyQCz5ifow1kuIl0mf4koF2rUO69v0FVgtjAEfWfqFKh8HjjA/s\n\t3bGb8gbHXIrgdoMb/A0=",
        "X-Received": "by 10.28.57.197 with SMTP id g188mr27225002wma.13.1499129933250; \n\tMon, 03 Jul 2017 17:58:53 -0700 (PDT)",
        "From": "Gaetan Rivet <gaetan.rivet@6wind.com>",
        "To": "dev@dpdk.org",
        "Cc": "Gaetan Rivet <gaetan.rivet@6wind.com>",
        "Date": "Tue,  4 Jul 2017 02:58:33 +0200",
        "Message-Id": "<3331659a85270eef374f7d491216ededea4e6c88.1499127915.git.gaetan.rivet@6wind.com>",
        "X-Mailer": "git-send-email 2.1.4",
        "In-Reply-To": [
            "<cover.1499127915.git.gaetan.rivet@6wind.com>",
            "<cover.1499127915.git.gaetan.rivet@6wind.com>"
        ],
        "References": [
            "<cover.1497999826.git.gaetan.rivet@6wind.com>\n\t<cover.1499127915.git.gaetan.rivet@6wind.com>",
            "<cover.1499127915.git.gaetan.rivet@6wind.com>"
        ],
        "Subject": "[dpdk-dev] [PATCH v6 6/6] devargs: parse bus info",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <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": "Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>\n---\n lib/librte_eal/common/eal_common_devargs.c  | 42 ++++++++++++++++++++++++-----\n lib/librte_eal/common/eal_common_vdev.c     |  6 +++--\n lib/librte_eal/common/include/rte_devargs.h |  3 +++\n 3 files changed, 42 insertions(+), 9 deletions(-)",
    "diff": "diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c\nindex ffa8ad9..102bd8d 100644\n--- a/lib/librte_eal/common/eal_common_devargs.c\n+++ b/lib/librte_eal/common/eal_common_devargs.c\n@@ -78,12 +78,23 @@ rte_eal_parse_devargs_str(const char *devargs_str,\n \treturn 0;\n }\n \n+static int\n+bus_name_cmp(const struct rte_bus *bus, const void *_name)\n+{\n+\tconst char *name = _name;\n+\n+\treturn strncmp(bus->name, name,\n+\t\t       strlen(bus->name));\n+}\n+\n /* store a whitelist parameter for later parsing */\n int\n rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)\n {\n \tstruct rte_devargs *devargs = NULL;\n-\tchar *buf = NULL;\n+\tstruct rte_bus *bus = NULL;\n+\tchar *dev = NULL;\n+\tconst char *devname;\n \tint ret;\n \n \t/* use malloc instead of rte_malloc as it's called early at init */\n@@ -94,34 +105,51 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)\n \tmemset(devargs, 0, sizeof(*devargs));\n \tdevargs->type = devtype;\n \n-\tif (rte_eal_parse_devargs_str(devargs_str, &buf, &devargs->args))\n+\tif (rte_eal_parse_devargs_str(devargs_str, &dev, &devargs->args))\n \t\tgoto fail;\n+\tdevname = dev;\n+\tdo {\n+\t\tbus = rte_bus_find(bus, bus_name_cmp, dev);\n+\t\tif (bus == NULL)\n+\t\t\tbreak;\n+\t\tdevname = dev + strlen(bus->name) + 1;\n+\t\tif (rte_bus_find_by_device_name(devname) == bus)\n+\t\t\tbreak;\n+\t\tdevname = dev;\n+\t} while (1);\n+\tif (bus == NULL) {\n+\t\tbus = rte_bus_find_by_device_name(devname);\n+\t\tif (bus == NULL) {\n+\t\t\tfprintf(stderr, \"ERROR: failed to parse bus info from device declaration\\n\");\n+\t\t\tgoto fail;\n+\t\t}\n+\t}\n+\tdevargs->bus = bus;\n \n \tswitch (devargs->type) {\n \tcase RTE_DEVTYPE_WHITELISTED_PCI:\n \tcase RTE_DEVTYPE_BLACKLISTED_PCI:\n \t\t/* try to parse pci identifier */\n-\t\tif (eal_parse_pci_BDF(buf, &devargs->pci.addr) != 0 &&\n-\t\t    eal_parse_pci_DomBDF(buf, &devargs->pci.addr) != 0)\n+\t\tif (bus->parse(devname, &devargs->pci.addr) != 0)\n \t\t\tgoto fail;\n \n \t\tbreak;\n \tcase RTE_DEVTYPE_VIRTUAL:\n \t\t/* save driver name */\n \t\tret = snprintf(devargs->virt.drv_name,\n-\t\t\t       sizeof(devargs->virt.drv_name), \"%s\", buf);\n+\t\t\t       sizeof(devargs->virt.drv_name), \"%s\", devname);\n \t\tif (ret < 0 || ret >= (int)sizeof(devargs->virt.drv_name))\n \t\t\tgoto fail;\n \n \t\tbreak;\n \t}\n \n-\tfree(buf);\n+\tfree(dev);\n \tTAILQ_INSERT_TAIL(&devargs_list, devargs, next);\n \treturn 0;\n \n fail:\n-\tfree(buf);\n+\tfree(dev);\n \tif (devargs) {\n \t\tfree(devargs->args);\n \t\tfree(devargs);\ndiff --git a/lib/librte_eal/common/eal_common_vdev.c b/lib/librte_eal/common/eal_common_vdev.c\nindex 75a7b93..79ec528 100644\n--- a/lib/librte_eal/common/eal_common_vdev.c\n+++ b/lib/librte_eal/common/eal_common_vdev.c\n@@ -177,6 +177,7 @@ alloc_devargs(const char *name, const char *args)\n \t\treturn NULL;\n \n \tdevargs->type = RTE_DEVTYPE_VIRTUAL;\n+\tdevargs->bus = rte_bus_find_by_name(VIRTUAL_BUS_NAME);\n \tif (args)\n \t\tdevargs->args = strdup(args);\n \n@@ -289,12 +290,13 @@ vdev_scan(void)\n {\n \tstruct rte_vdev_device *dev;\n \tstruct rte_devargs *devargs;\n+\tstruct rte_bus *vbus;\n \n \t/* for virtual devices we scan the devargs_list populated via cmdline */\n-\n+\tvbus = rte_bus_find_by_name(VIRTUAL_BUS_NAME);\n \tTAILQ_FOREACH(devargs, &devargs_list, next) {\n \n-\t\tif (devargs->type != RTE_DEVTYPE_VIRTUAL)\n+\t\tif (devargs->bus != vbus)\n \t\t\tcontinue;\n \n \t\tdev = find_vdev(devargs->virt.drv_name);\ndiff --git a/lib/librte_eal/common/include/rte_devargs.h b/lib/librte_eal/common/include/rte_devargs.h\nindex 88120a1..1f50a24 100644\n--- a/lib/librte_eal/common/include/rte_devargs.h\n+++ b/lib/librte_eal/common/include/rte_devargs.h\n@@ -51,6 +51,7 @@ extern \"C\" {\n #include <stdio.h>\n #include <sys/queue.h>\n #include <rte_pci.h>\n+#include <rte_bus.h>\n \n /**\n  * Type of generic device\n@@ -89,6 +90,8 @@ struct rte_devargs {\n \t\t\tchar drv_name[32];\n \t\t} virt;\n \t};\n+\t/** Bus handle for the device. */\n+\tstruct rte_bus *bus;\n \t/** Arguments string as given by user or \"\" for no argument. */\n \tchar *args;\n };\n",
    "prefixes": [
        "dpdk-dev",
        "v6",
        "6/6"
    ]
}