From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4B68CA0487 for ; Tue, 30 Jul 2019 09:29:19 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1B4E31BECB; Tue, 30 Jul 2019 09:29:19 +0200 (CEST) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by dpdk.org (Postfix) with ESMTP id 43EEF1BECB for ; Tue, 30 Jul 2019 09:29:17 +0200 (CEST) Received: by mail-pl1-f193.google.com with SMTP id y8so28553095plr.12 for ; Tue, 30 Jul 2019 00:29:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=/FRfJBoMxpRtJzVAN+SaefStp37PHQR8YMZ/JalKu/I=; b=pWyXGh7g0UiQohXcelS9vatUiXYFOP7OBtlBFz+iFT4Gi57M9y+sLAL5nmUKOQ7v1L wVRA+aEtS8J1HFCzKhcpx7NdzBaaflpby7OVA9UP8fT2biQWjl8CGzoqEbW0Kp7Kd5hV DiPnwxWGw4Hk2w1iR4BOcB9aHPKJYPg5bd/2gnBqRvPmiKPw3Zejsmpq1C0Qh/WxxOaA /wZXBBWm3GTZJJAH/ebs7uXJ/0ESp14kBa6RQgpuGfSjdYa+8aPoRhIVYKk0Jnx+2XG9 2f75G87KOX4va7sQcU2YpoPQb/z6EX4iXPnhFMMonca+dJ2MVXKiM3rYARtPOslkhmHw bIkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=/FRfJBoMxpRtJzVAN+SaefStp37PHQR8YMZ/JalKu/I=; b=m/gxLzZ0LaBpTQ2gaYKwLRlAI95POc6L6NkUuxgs9kmB2IOIwA3oPwizF1zdPyP0ZX 4H4G0MNVMo9qoHrQKapJbZfm5GqXFF5Qd2IU7un4EK9OpS1U1sGZjQxCpI9t9X+XlXGr eX9iyKeZ5MyARDh/izQCIuTxam+13+/P4vddPEkJDRNGd08xOCXmaevDE4x/OyGXI7N8 ZosB7Ja8sYkE1pxlHMywtVMUJgYjYdOHNSCRuchJdFSEhVIguMq8ixYCeTB3tmv6grnX oJPChcZYkP1VLsh1+gmgAC+wAz1kJMoKSSrRmLsf3luJ34Api5+7UoYWyEqdwRjyaO9e ROCw== X-Gm-Message-State: APjAAAWHWup9jlD4up2YTohS7qVYwXo0aQe+YcOOBzBur+pVwch5vv+9 P/EnONoMoBJkM+ismFMMW0/uVHtv X-Google-Smtp-Source: APXvYqzhR1xFKDKgPFLCeN7QPEBoyl92YQbhmUbM6zEpJOW9ODWLPE8v9PeYnN5CYYQOf53RpIS09A== X-Received: by 2002:a17:902:6a88:: with SMTP id n8mr114090346plk.70.1564471756401; Tue, 30 Jul 2019 00:29:16 -0700 (PDT) Received: from localhost.localdomain ([192.47.164.146]) by smtp.gmail.com with ESMTPSA id 131sm79145985pfx.57.2019.07.30.00.29.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jul 2019 00:29:15 -0700 (PDT) From: yasufum.o@gmail.com To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Tue, 30 Jul 2019 16:29:07 +0900 Message-Id: <20190730072907.3849-1-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [spp] [PATCH] shared: support old desc of vdev tyep X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spp-bounces@dpdk.org Sender: "spp" From: Yasufumi Ogawa In DPDK, vdev was described with prefix `eth` such as `eth_vhost0`, but is changed to use `net` instead of `eth`. Because both of prefixes are supported currently, SPP should also accept both. Signed-off-by: Yasufumi Ogawa --- src/shared/common.c | 46 +++++++++++++++++++++++++-------------------- src/shared/common.h | 13 ++++++++----- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/src/shared/common.c b/src/shared/common.c index 6655f17..aa1486a 100644 --- a/src/shared/common.c +++ b/src/shared/common.c @@ -176,47 +176,53 @@ int parse_dev_name(char *dev_name, int *port_type, int *port_id) int dev_name_len = strlen(dev_name); int dev_str_len; - if (strncmp(dev_name, VDEV_PREFIX_RING, - strlen(VDEV_PREFIX_RING)) == 0) { - dev_str_len = strlen(VDEV_PREFIX_RING); + if (strncmp(dev_name, VDEV_ETH_RING, + strlen(VDEV_ETH_RING)) == 0 || + strncmp(dev_name, VDEV_NET_RING, + strlen(VDEV_NET_RING)) == 0) { + dev_str_len = strlen(VDEV_NET_RING); pid_len = dev_name_len - dev_str_len; - strncpy(pid_str, dev_name + strlen(VDEV_PREFIX_RING), + strncpy(pid_str, dev_name + strlen(VDEV_NET_RING), pid_len); *port_id = (int)strtol(pid_str, NULL, 10); *port_type = RING; - } else if (strncmp(dev_name, VDEV_PREFIX_VHOST, - strlen(VDEV_PREFIX_VHOST)) == 0) { - dev_str_len = strlen(VDEV_PREFIX_VHOST); + } else if (strncmp(dev_name, VDEV_ETH_VHOST, + strlen(VDEV_ETH_VHOST)) == 0 || + strncmp(dev_name, VDEV_NET_VHOST, + strlen(VDEV_NET_VHOST)) == 0) { + dev_str_len = strlen(VDEV_NET_VHOST); pid_len = dev_name_len - dev_str_len; - strncpy(pid_str, dev_name + strlen(VDEV_PREFIX_VHOST), + strncpy(pid_str, dev_name + strlen(VDEV_NET_VHOST), pid_len); *port_id = (int)strtol(pid_str, NULL, 10); *port_type = VHOST; - } else if (strncmp(dev_name, VDEV_PREFIX_PCAP, - strlen(VDEV_PREFIX_PCAP)) == 0) { - dev_str_len = strlen(VDEV_PREFIX_PCAP); + } else if (strncmp(dev_name, VDEV_PCAP, + strlen(VDEV_PCAP)) == 0) { + dev_str_len = strlen(VDEV_PCAP); pid_len = dev_name_len - dev_str_len; - strncpy(pid_str, dev_name + strlen(VDEV_PREFIX_PCAP), + strncpy(pid_str, dev_name + strlen(VDEV_PCAP), pid_len); *port_id = (int)strtol(pid_str, NULL, 10); *port_type = PCAP; - } else if (strncmp(dev_name, VDEV_PREFIX_TAP, - strlen(VDEV_PREFIX_TAP)) == 0) { - dev_str_len = strlen(VDEV_PREFIX_TAP); + } else if (strncmp(dev_name, VDEV_ETH_TAP, + strlen(VDEV_ETH_TAP)) == 0 || + strncmp(dev_name, VDEV_NET_TAP, + strlen(VDEV_NET_TAP)) == 0) { + dev_str_len = strlen(VDEV_NET_TAP); pid_len = dev_name_len - dev_str_len; - strncpy(pid_str, dev_name + strlen(VDEV_PREFIX_TAP), + strncpy(pid_str, dev_name + strlen(VDEV_NET_TAP), pid_len); *port_id = (int)strtol(pid_str, NULL, 10); *port_type = TAP; - } else if (strncmp(dev_name, VDEV_PREFIX_NULL, - strlen(VDEV_PREFIX_NULL)) == 0) { - dev_str_len = strlen(VDEV_PREFIX_NULL); + } else if (strncmp(dev_name, VDEV_NULL, + strlen(VDEV_NULL)) == 0) { + dev_str_len = strlen(VDEV_NULL); pid_len = dev_name_len - dev_str_len; - strncpy(pid_str, dev_name + strlen(VDEV_PREFIX_NULL), + strncpy(pid_str, dev_name + strlen(VDEV_NULL), pid_len); *port_id = (int)strtol(pid_str, NULL, 10); *port_type = PCAP; diff --git a/src/shared/common.h b/src/shared/common.h index d51d6df..4d0dbe8 100644 --- a/src/shared/common.h +++ b/src/shared/common.h @@ -43,11 +43,14 @@ #define RTE_MP_RX_DESC_DEFAULT 512 #define RTE_MP_TX_DESC_DEFAULT 512 -#define VDEV_PREFIX_RING "net_ring" -#define VDEV_PREFIX_VHOST "eth_vhost" -#define VDEV_PREFIX_PCAP "net_pcap" -#define VDEV_PREFIX_TAP "net_tap" -#define VDEV_PREFIX_NULL "eth_null" +#define VDEV_ETH_RING "eth_ring" +#define VDEV_NET_RING "net_ring" +#define VDEV_ETH_VHOST "eth_vhost" +#define VDEV_NET_VHOST "net_vhost" +#define VDEV_PCAP "net_pcap" +#define VDEV_ETH_TAP "eth_tap" +#define VDEV_NET_TAP "net_tap" +#define VDEV_NULL "eth_null" /* Command. */ -- 2.17.1