ethdev: add PFCP header to flow API

[dpdk.git] / lib / librte_pci / rte_pci.c

diff --git a/lib/librte_pci/rte_pci.c b/lib/librte_pci/rte_pci.c
index 1a6d748..d1ab6b4 100644 (file)
--- a/lib/librte_pci/rte_pci.c
+++ b/lib/librte_pci/rte_pci.c
@@ -20,6 +20,7 @@
 #include <rte_eal.h>
 #include <rte_string_fns.h>
 #include <rte_common.h>
+#include <rte_debug.h>
 
 #include "rte_pci.h"
 
@@ -30,6 +31,10 @@ get_u8_pciaddr_field(const char *in, void *_u8, char dlm)
        uint8_t *u8 = _u8;
        char *end;
 
+       /* empty string is an error though strtoul() returns 0 */
+       if (*in == '\0')
+               return NULL;
+
        errno = 0;
        val = strtoul(in, &end, 16);
        if (errno != 0 || end[0] != dlm || val > UINT8_MAX) {
@@ -83,18 +88,6 @@ pci_dbdf_parse(const char *input, struct rte_pci_addr *dev_addr)
        return 0;
 }
 
-int
-eal_parse_pci_BDF(const char *input, struct rte_pci_addr *dev_addr)
-{
-       return pci_bdf_parse(input, dev_addr);
-}
-
-int
-eal_parse_pci_DomBDF(const char *input, struct rte_pci_addr *dev_addr)
-{
-       return pci_dbdf_parse(input, dev_addr);
-}
-
 void
 rte_pci_device_name(const struct rte_pci_addr *addr,
                char *output, size_t size)
@@ -105,13 +98,6 @@ rte_pci_device_name(const struct rte_pci_addr *addr,
                            addr->devid, addr->function) >= 0);
 }
 
-int
-rte_eal_compare_pci_addr(const struct rte_pci_addr *addr,
-                        const struct rte_pci_addr *addr2)
-{
-       return rte_pci_addr_cmp(addr, addr2);
-}
-
 int
 rte_pci_addr_cmp(const struct rte_pci_addr *addr,
             const struct rte_pci_addr *addr2)
@@ -155,9 +141,10 @@ pci_map_resource(void *requested_addr, int fd, off_t offset, size_t size,
        mapaddr = mmap(requested_addr, size, PROT_READ | PROT_WRITE,
                        MAP_SHARED | additional_flags, fd, offset);
        if (mapaddr == MAP_FAILED) {
-               RTE_LOG(ERR, EAL, "%s(): cannot mmap(%d, %p, 0x%lx, 0x%lx): %s (%p)\n",
-                       __func__, fd, requested_addr,
-                       (unsigned long)size, (unsigned long)offset,
+               RTE_LOG(ERR, EAL,
+                       "%s(): cannot mmap(%d, %p, 0x%zx, 0x%llx): %s (%p)\n",
+                       __func__, fd, requested_addr, size,
+                       (unsigned long long)offset,
                        strerror(errno), mapaddr);
        } else
                RTE_LOG(DEBUG, EAL, "  PCI memory mapped at %p\n", mapaddr);
@@ -174,8 +161,8 @@ pci_unmap_resource(void *requested_addr, size_t size)
 
        /* Unmap the PCI memory resource of device */
        if (munmap(requested_addr, size)) {
-               RTE_LOG(ERR, EAL, "%s(): cannot munmap(%p, 0x%lx): %s\n",
-                       __func__, requested_addr, (unsigned long)size,
+               RTE_LOG(ERR, EAL, "%s(): cannot munmap(%p, %#zx): %s\n",
+                       __func__, requested_addr, size,
                        strerror(errno));
        } else
                RTE_LOG(DEBUG, EAL, "  PCI memory unmapped at %p\n",