Patch Detail

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

{
    "id": 88714,
    "url": "http://patches.dpdk.org/api/patches/88714/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210308222410.819751-1-thomas@monjalon.net/",
    "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": "<20210308222410.819751-1-thomas@monjalon.net>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20210308222410.819751-1-thomas@monjalon.net",
    "date": "2021-03-08T22:24:10",
    "name": "vfio: reformat logs",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "74630e9e215a47fc813dd3b72300ab05c7b7155d",
    "submitter": {
        "id": 685,
        "url": "http://patches.dpdk.org/api/people/685/?format=api",
        "name": "Thomas Monjalon",
        "email": "thomas@monjalon.net"
    },
    "delegate": {
        "id": 24651,
        "url": "http://patches.dpdk.org/api/users/24651/?format=api",
        "username": "dmarchand",
        "first_name": "David",
        "last_name": "Marchand",
        "email": "david.marchand@redhat.com"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210308222410.819751-1-thomas@monjalon.net/mbox/",
    "series": [
        {
            "id": 15535,
            "url": "http://patches.dpdk.org/api/series/15535/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=15535",
            "date": "2021-03-08T22:24:10",
            "name": "vfio: reformat logs",
            "version": 1,
            "mbox": "http://patches.dpdk.org/series/15535/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/88714/comments/",
    "check": "warning",
    "checks": "http://patches.dpdk.org/api/patches/88714/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@inbox.dpdk.org",
        "Delivered-To": "patchwork@inbox.dpdk.org",
        "Received": [
            "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 5AD02A0566;\n\tMon,  8 Mar 2021 23:24:28 +0100 (CET)",
            "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 3E85D22A4C6;\n\tMon,  8 Mar 2021 23:24:28 +0100 (CET)",
            "from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com\n [66.111.4.27]) by mails.dpdk.org (Postfix) with ESMTP id AB7B522A4C4\n for <dev@dpdk.org>; Mon,  8 Mar 2021 23:24:26 +0100 (CET)",
            "from compute2.internal (compute2.nyi.internal [10.202.2.42])\n by mailout.nyi.internal (Postfix) with ESMTP id 514125C0098;\n Mon,  8 Mar 2021 17:24:26 -0500 (EST)",
            "from mailfrontend1 ([10.202.2.162])\n by compute2.internal (MEProxy); Mon, 08 Mar 2021 17:24:26 -0500",
            "from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])\n by mail.messagingengine.com (Postfix) with ESMTPA id B602724005B;\n Mon,  8 Mar 2021 17:24:25 -0500 (EST)"
        ],
        "DKIM-Signature": [
            "v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=\n from:to:cc:subject:date:message-id:mime-version\n :content-transfer-encoding; s=fm3; bh=5ZjhkxKUYA1kFgL3OKx0UCGdkh\n wlhwW5hcNV4IHfy7U=; b=l1kFax96meyZZWNuIg0DUAeL/eSuxFidKGzs3i28nS\n Sl/lqpTX+tenfXRMhRIO7jWPoaZsZ1BA1PAbm1ITdQJ+/QtZonVDPsn2C8RPCaGU\n fpHNNGCvUl9FTv0MZz+mtRzVjivmEByHVto6r0t+3tAS+b7axHMkf/sQEQ2qk6hs\n rxW0ao5HE7RUJhLcZ+vJ2VhpXhFZsHtzjI8IsQ8x9BCH5vmDo99LfkEq+fjXm5t3\n a2lZeB3AAhCvaC7RUqhRfOuVPe6E0uddtf/wIrvidyhSfd5yqmLUxsw722i4TBSV\n tAnKe3TiPhh8wt0YGyoErqDhqsTpsMJ4We5olEd2QcUQ==",
            "v=1; a=rsa-sha256; c=relaxed/relaxed; d=\n messagingengine.com; h=cc:content-transfer-encoding:date:from\n :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy\n :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=5ZjhkxKUYA1kFgL3O\n Kx0UCGdkhwlhwW5hcNV4IHfy7U=; b=coAFr4J4MhjW3az5A7Y9Jf5s0p/o6jFIk\n 7GYK0IYECqAFXQDpG28ATrYkBa6SPyhtNNmBuWmwyCTpXvoQ6CwiQMKLK4Fa8b/7\n +92k5PMyatg9B+zN2YLUlEVPuspHyG54RvVF/QyvfInDpk5HL3iwc2TYrzlfqEcy\n 66JLlz25kqrgOJ+wqxvnxeYmZlNGARBvQUwDZWcc/9e+YK55w+Lp7hE6ievSz0zH\n ra7Wh5KJ/bre1JORrRpF40DAfzFTQO8echIMYaXgOUQgFYBxyzPLr5ho98aoan8x\n 1LZZGK7gIVdXOXqORvSZHlLBfwRV4n2Gexe4YNQRx9AdtE0854UJQ=="
        ],
        "X-ME-Sender": "<xms:GqRGYIvwrf45C3o0GpqNfPe0ovxpQ7SlcHQyhro5t3fqJshMgWzjxQ>\n <xme:GqRGYFdpRkh4SdFgBidaWPTXnfU9G7NUb7NjGHQKc-hv469unG85MQu3VYHHQ9dPL\n gnrfCIWqao6A74LRA>",
        "X-ME-Proxy-Cause": "\n gggruggvucftvghtrhhoucdtuddrgeduledruddugedgledvucetufdoteggodetrfdotf\n fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen\n uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne\n cujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgrshcu\n ofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecuggftrf\n grthhtvghrnhepvdelvdduhedvudduveeuvdevheegudelgeeigfejheduhedttdegudff\n jeeihffgnecukfhppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghrufhiii\n gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghlohhn\n rdhnvght",
        "X-ME-Proxy": "<xmx:GqRGYDxcM46dBTz_vSuj48zdFOIq0C-H8G-25ILRhl4FdGq0QqNwUg>\n <xmx:GqRGYLOZ7wTt4BCPAammJM6vc4OxQIVxybUiqww4t1E1vnw8HNgfFg>\n <xmx:GqRGYI8HY4WBd1wU42r6mrjwYqgj5XDgheccUlbdy5WAsQhlRoqHkw>\n <xmx:GqRGYBLQ175eSJmBMD7B01-1dkCbm_J3a4xmv9pIY46SHy8ep8-Rqw>",
        "From": "Thomas Monjalon <thomas@monjalon.net>",
        "To": "dev@dpdk.org",
        "Cc": "Anatoly Burakov <anatoly.burakov@intel.com>",
        "Date": "Mon,  8 Mar 2021 23:24:10 +0100",
        "Message-Id": "<20210308222410.819751-1-thomas@monjalon.net>",
        "X-Mailer": "git-send-email 2.30.1",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[dpdk-dev] [PATCH] vfio: reformat logs",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.29",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "The log messages had various issues:\n- split on 2 lines, making search (grep) difficult\n- long lines (can be split after the string)\n- indented for no good reason (parent message may have higher log level)\n- inconsistent use of __func__, not meaningful context for user\n- lack of context (general message not mentioning VFIO)\n- log level too high (more below)\n\nMessage having its level decreased from WARNING to NOTICE:\n\t\"not managed by VFIO driver, skipping\"\nMessage having its level decreased from INFO to DEBUG:\n\t\"Probing VFIO support...\"\n\nSigned-off-by: Thomas Monjalon <thomas@monjalon.net>\n---\n drivers/bus/pci/linux/pci_vfio.c |  72 +++++------\n lib/librte_eal/linux/eal_vfio.c  | 198 ++++++++++++++++---------------\n 2 files changed, 140 insertions(+), 130 deletions(-)",
    "diff": "diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c\nindex e3f7b6abeb..ee90ed16c8 100644\n--- a/drivers/bus/pci/linux/pci_vfio.c\n+++ b/drivers/bus/pci/linux/pci_vfio.c\n@@ -78,8 +78,8 @@ pci_vfio_get_msix_bar(int fd, struct pci_msix_table *msix_table)\n \t\t\tVFIO_GET_REGION_ADDR(VFIO_PCI_CONFIG_REGION_INDEX) +\n \t\t\tPCI_CAPABILITY_LIST);\n \tif (ret != sizeof(reg)) {\n-\t\tRTE_LOG(ERR, EAL, \"Cannot read capability pointer from PCI \"\n-\t\t\t\t\"config space!\\n\");\n+\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\"Cannot read capability pointer from PCI config space!\\n\");\n \t\treturn -1;\n \t}\n \n@@ -93,8 +93,8 @@ pci_vfio_get_msix_bar(int fd, struct pci_msix_table *msix_table)\n \t\t\t\tVFIO_GET_REGION_ADDR(VFIO_PCI_CONFIG_REGION_INDEX) +\n \t\t\t\tcap_offset);\n \t\tif (ret != sizeof(reg)) {\n-\t\t\tRTE_LOG(ERR, EAL, \"Cannot read capability ID from PCI \"\n-\t\t\t\t\t\"config space!\\n\");\n+\t\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\t\"Cannot read capability ID from PCI config space!\\n\");\n \t\t\treturn -1;\n \t\t}\n \n@@ -107,8 +107,8 @@ pci_vfio_get_msix_bar(int fd, struct pci_msix_table *msix_table)\n \t\t\t\t\tVFIO_GET_REGION_ADDR(VFIO_PCI_CONFIG_REGION_INDEX) +\n \t\t\t\t\tcap_offset);\n \t\t\tif (ret != sizeof(reg)) {\n-\t\t\t\tRTE_LOG(ERR, EAL, \"Cannot read capability pointer from PCI \"\n-\t\t\t\t\t\t\"config space!\\n\");\n+\t\t\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\t\t\"Cannot read capability pointer from PCI config space!\\n\");\n \t\t\t\treturn -1;\n \t\t\t}\n \n@@ -124,8 +124,8 @@ pci_vfio_get_msix_bar(int fd, struct pci_msix_table *msix_table)\n \t\t\t\t\tVFIO_GET_REGION_ADDR(VFIO_PCI_CONFIG_REGION_INDEX) +\n \t\t\t\t\tcap_offset + 4);\n \t\t\tif (ret != sizeof(reg)) {\n-\t\t\t\tRTE_LOG(ERR, EAL, \"Cannot read table offset from PCI config \"\n-\t\t\t\t\t\t\"space!\\n\");\n+\t\t\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\t\t\"Cannot read table offset from PCI config space!\\n\");\n \t\t\t\treturn -1;\n \t\t\t}\n \n@@ -133,8 +133,8 @@ pci_vfio_get_msix_bar(int fd, struct pci_msix_table *msix_table)\n \t\t\t\t\tVFIO_GET_REGION_ADDR(VFIO_PCI_CONFIG_REGION_INDEX) +\n \t\t\t\t\tcap_offset + 2);\n \t\t\tif (ret != sizeof(flags)) {\n-\t\t\t\tRTE_LOG(ERR, EAL, \"Cannot read table flags from PCI config \"\n-\t\t\t\t\t\t\"space!\\n\");\n+\t\t\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\t\t\"Cannot read table flags from PCI config space!\\n\");\n \t\t\t\treturn -1;\n \t\t\t}\n \n@@ -244,7 +244,7 @@ pci_vfio_setup_interrupts(struct rte_pci_device *dev, int vfio_dev_fd)\n \tcase RTE_INTR_MODE_NONE:\n \t\tbreak;\n \tdefault:\n-\t\tRTE_LOG(ERR, EAL, \"  unknown default interrupt type!\\n\");\n+\t\tRTE_LOG(ERR, EAL, \"Unknown default interrupt type!\\n\");\n \t\treturn -1;\n \t}\n \n@@ -262,8 +262,8 @@ pci_vfio_setup_interrupts(struct rte_pci_device *dev, int vfio_dev_fd)\n \n \t\tret = ioctl(vfio_dev_fd, VFIO_DEVICE_GET_IRQ_INFO, &irq);\n \t\tif (ret < 0) {\n-\t\t\tRTE_LOG(ERR, EAL, \"  cannot get IRQ info, \"\n-\t\t\t\t\t\"error %i (%s)\\n\", errno, strerror(errno));\n+\t\t\tRTE_LOG(ERR, EAL, \"Cannot get VFIO IRQ info, error \"\n+\t\t\t\t\t\"%i (%s)\\n\", errno, strerror(errno));\n \t\t\treturn -1;\n \t\t}\n \n@@ -272,7 +272,7 @@ pci_vfio_setup_interrupts(struct rte_pci_device *dev, int vfio_dev_fd)\n \t\tif ((irq.flags & VFIO_IRQ_INFO_EVENTFD) == 0) {\n \t\t\tif (intr_mode != RTE_INTR_MODE_NONE) {\n \t\t\t\tRTE_LOG(ERR, EAL,\n-\t\t\t\t\t\t\"  interrupt vector does not support eventfd!\\n\");\n+\t\t\t\t\t\"Interrupt vector does not support eventfd!\\n\");\n \t\t\t\treturn -1;\n \t\t\t} else\n \t\t\t\tcontinue;\n@@ -281,8 +281,8 @@ pci_vfio_setup_interrupts(struct rte_pci_device *dev, int vfio_dev_fd)\n \t\t/* set up an eventfd for interrupts */\n \t\tfd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);\n \t\tif (fd < 0) {\n-\t\t\tRTE_LOG(ERR, EAL, \"  cannot set up eventfd, \"\n-\t\t\t\t\t\"error %i (%s)\\n\", errno, strerror(errno));\n+\t\t\tRTE_LOG(ERR, EAL, \"Cannot set up eventfd, error \"\n+\t\t\t\t\t\"%i (%s)\\n\", errno, strerror(errno));\n \t\t\treturn -1;\n \t\t}\n \n@@ -303,7 +303,7 @@ pci_vfio_setup_interrupts(struct rte_pci_device *dev, int vfio_dev_fd)\n \t\t\tdev->intr_handle.type = RTE_INTR_HANDLE_VFIO_LEGACY;\n \t\t\tbreak;\n \t\tdefault:\n-\t\t\tRTE_LOG(ERR, EAL, \"  unknown interrupt type!\\n\");\n+\t\t\tRTE_LOG(ERR, EAL, \"Unknown interrupt type!\\n\");\n \t\t\treturn -1;\n \t\t}\n \n@@ -621,7 +621,8 @@ pci_vfio_get_region_info(int vfio_dev_fd, struct vfio_region_info **info,\n \n \tri = malloc(sizeof(*ri));\n \tif (ri == NULL) {\n-\t\tRTE_LOG(ERR, EAL, \"Cannot allocate memory for region info\\n\");\n+\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\"Cannot allocate memory for VFIO region info\\n\");\n \t\treturn -1;\n \t}\n again:\n@@ -643,7 +644,8 @@ pci_vfio_get_region_info(int vfio_dev_fd, struct vfio_region_info **info,\n \t\tif (tmp == NULL) {\n \t\t\t/* realloc failed but the ri is still there */\n \t\t\tfree(ri);\n-\t\t\tRTE_LOG(ERR, EAL, \"Cannot reallocate memory for region info\\n\");\n+\t\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\t\"Cannot reallocate memory for VFIO region info\\n\");\n \t\t\treturn -1;\n \t\t}\n \t\tri = tmp;\n@@ -726,7 +728,7 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev)\n \tvfio_res = rte_zmalloc(\"VFIO_RES\", sizeof(*vfio_res), 0);\n \tif (vfio_res == NULL) {\n \t\tRTE_LOG(ERR, EAL,\n-\t\t\t\"%s(): cannot store vfio mmap details\\n\", __func__);\n+\t\t\t\"Cannot store VFIO mmap details\\n\");\n \t\tgoto err_vfio_dev_fd;\n \t}\n \tmemcpy(&vfio_res->pci_addr, &dev->addr, sizeof(vfio_res->pci_addr));\n@@ -744,7 +746,7 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev)\n \t */\n \tret = pci_vfio_get_msix_bar(vfio_dev_fd, &vfio_res->msix_table);\n \tif (ret < 0) {\n-\t\tRTE_LOG(ERR, EAL, \"  %s cannot get MSI-X BAR number!\\n\",\n+\t\tRTE_LOG(ERR, EAL, \"%s cannot get MSI-X BAR number!\\n\",\n \t\t\t\tpci_addr);\n \t\tgoto err_vfio_res;\n \t}\n@@ -768,9 +770,9 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev)\n \n \t\tret = pci_vfio_get_region_info(vfio_dev_fd, &reg, i);\n \t\tif (ret < 0) {\n-\t\t\tRTE_LOG(ERR, EAL, \"  %s cannot get device region info \"\n-\t\t\t\t\"error %i (%s)\\n\", pci_addr, errno,\n-\t\t\t\tstrerror(errno));\n+\t\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\t\"%s cannot get device region info error \"\n+\t\t\t\t\"%i (%s)\\n\", pci_addr, errno, strerror(errno));\n \t\t\tgoto err_vfio_res;\n \t\t}\n \n@@ -809,7 +811,7 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev)\n \n \t\tret = pci_vfio_mmap_bar(vfio_dev_fd, vfio_res, i, 0);\n \t\tif (ret < 0) {\n-\t\t\tRTE_LOG(ERR, EAL, \"  %s mapping BAR%i failed: %s\\n\",\n+\t\t\tRTE_LOG(ERR, EAL, \"%s mapping BAR%i failed: %s\\n\",\n \t\t\t\t\tpci_addr, i, strerror(errno));\n \t\t\tfree(reg);\n \t\t\tgoto err_vfio_res;\n@@ -821,7 +823,7 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev)\n \t}\n \n \tif (pci_rte_vfio_setup_device(dev, vfio_dev_fd) < 0) {\n-\t\tRTE_LOG(ERR, EAL, \"  %s setup device failed\\n\", pci_addr);\n+\t\tRTE_LOG(ERR, EAL, \"%s setup device failed\\n\", pci_addr);\n \t\tgoto err_vfio_res;\n \t}\n \n@@ -875,7 +877,7 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev)\n \t}\n \t/* if we haven't found our tailq entry, something's wrong */\n \tif (vfio_res == NULL) {\n-\t\tRTE_LOG(ERR, EAL, \"  %s cannot find TAILQ entry for PCI device!\\n\",\n+\t\tRTE_LOG(ERR, EAL, \"%s cannot find TAILQ entry for PCI device!\\n\",\n \t\t\t\tpci_addr);\n \t\treturn -1;\n \t}\n@@ -891,7 +893,7 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev)\n \tfor (i = 0; i < vfio_res->nb_maps; i++) {\n \t\tret = pci_vfio_mmap_bar(vfio_dev_fd, vfio_res, i, MAP_FIXED);\n \t\tif (ret < 0) {\n-\t\t\tRTE_LOG(ERR, EAL, \"  %s mapping BAR%i failed: %s\\n\",\n+\t\t\tRTE_LOG(ERR, EAL, \"%s mapping BAR%i failed: %s\\n\",\n \t\t\t\t\tpci_addr, i, strerror(errno));\n \t\t\tgoto err_vfio_dev_fd;\n \t\t}\n@@ -944,7 +946,7 @@ find_and_unmap_vfio_resource(struct mapped_pci_res_list *vfio_res_list,\n \tif  (vfio_res == NULL)\n \t\treturn vfio_res;\n \n-\tRTE_LOG(INFO, EAL, \"Releasing pci mapped resource for %s\\n\",\n+\tRTE_LOG(INFO, EAL, \"Releasing PCI mapped resource for %s\\n\",\n \t\tpci_addr);\n \n \tmaps = vfio_res->maps;\n@@ -992,7 +994,7 @@ pci_vfio_unmap_resource_primary(struct rte_pci_device *dev)\n \t}\n \n \tif (pci_vfio_set_bus_master(dev->intr_handle.vfio_dev_fd, false)) {\n-\t\tRTE_LOG(ERR, EAL, \"  %s cannot unset bus mastering for PCI device!\\n\",\n+\t\tRTE_LOG(ERR, EAL, \"%s cannot unset bus mastering for PCI device!\\n\",\n \t\t\t\tpci_addr);\n \t\treturn -1;\n \t}\n@@ -1000,8 +1002,7 @@ pci_vfio_unmap_resource_primary(struct rte_pci_device *dev)\n \tret = rte_vfio_release_device(rte_pci_get_sysfs_path(), pci_addr,\n \t\t\t\t  dev->intr_handle.vfio_dev_fd);\n \tif (ret < 0) {\n-\t\tRTE_LOG(ERR, EAL,\n-\t\t\t\"%s(): cannot release device\\n\", __func__);\n+\t\tRTE_LOG(ERR, EAL, \"Cannot release VFIO device\\n\");\n \t\treturn ret;\n \t}\n \n@@ -1011,7 +1012,7 @@ pci_vfio_unmap_resource_primary(struct rte_pci_device *dev)\n \n \t/* if we haven't found our tailq entry, something's wrong */\n \tif (vfio_res == NULL) {\n-\t\tRTE_LOG(ERR, EAL, \"  %s cannot find TAILQ entry for PCI device!\\n\",\n+\t\tRTE_LOG(ERR, EAL, \"%s cannot find TAILQ entry for PCI device!\\n\",\n \t\t\t\tpci_addr);\n \t\treturn -1;\n \t}\n@@ -1037,8 +1038,7 @@ pci_vfio_unmap_resource_secondary(struct rte_pci_device *dev)\n \tret = rte_vfio_release_device(rte_pci_get_sysfs_path(), pci_addr,\n \t\t\t\t  dev->intr_handle.vfio_dev_fd);\n \tif (ret < 0) {\n-\t\tRTE_LOG(ERR, EAL,\n-\t\t\t\"%s(): cannot release device\\n\", __func__);\n+\t\tRTE_LOG(ERR, EAL, \"Cannot release VFIO device\\n\");\n \t\treturn ret;\n \t}\n \n@@ -1048,7 +1048,7 @@ pci_vfio_unmap_resource_secondary(struct rte_pci_device *dev)\n \n \t/* if we haven't found our tailq entry, something's wrong */\n \tif (vfio_res == NULL) {\n-\t\tRTE_LOG(ERR, EAL, \"  %s cannot find TAILQ entry for PCI device!\\n\",\n+\t\tRTE_LOG(ERR, EAL, \"%s cannot find TAILQ entry for PCI device!\\n\",\n \t\t\t\tpci_addr);\n \t\treturn -1;\n \t}\ndiff --git a/lib/librte_eal/linux/eal_vfio.c b/lib/librte_eal/linux/eal_vfio.c\nindex b15b75882b..fae07adcd4 100644\n--- a/lib/librte_eal/linux/eal_vfio.c\n+++ b/lib/librte_eal/linux/eal_vfio.c\n@@ -283,8 +283,8 @@ vfio_open_group_fd(int iommu_group_num)\n \t\tif (vfio_group_fd < 0) {\n \t\t\t/* if file not found, it's not an error */\n \t\t\tif (errno != ENOENT) {\n-\t\t\t\tRTE_LOG(ERR, EAL, \"Cannot open %s: %s\\n\", filename,\n-\t\t\t\t\t\tstrerror(errno));\n+\t\t\t\tRTE_LOG(ERR, EAL, \"Cannot open %s: %s\\n\",\n+\t\t\t\t\t\tfilename, strerror(errno));\n \t\t\t\treturn -1;\n \t\t\t}\n \n@@ -295,8 +295,9 @@ vfio_open_group_fd(int iommu_group_num)\n \t\t\tvfio_group_fd = open(filename, O_RDWR);\n \t\t\tif (vfio_group_fd < 0) {\n \t\t\t\tif (errno != ENOENT) {\n-\t\t\t\t\tRTE_LOG(ERR, EAL, \"Cannot open %s: %s\\n\", filename,\n-\t\t\t\t\t\t\tstrerror(errno));\n+\t\t\t\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\t\t\t\"Cannot open %s: %s\\n\",\n+\t\t\t\t\t\tfilename, strerror(errno));\n \t\t\t\t\treturn -1;\n \t\t\t\t}\n \t\t\t\treturn -ENOENT;\n@@ -323,14 +324,14 @@ vfio_open_group_fd(int iommu_group_num)\n \t\tif (p->result == SOCKET_OK && mp_rep->num_fds == 1) {\n \t\t\tvfio_group_fd = mp_rep->fds[0];\n \t\t} else if (p->result == SOCKET_NO_FD) {\n-\t\t\tRTE_LOG(ERR, EAL, \"  bad VFIO group fd\\n\");\n+\t\t\tRTE_LOG(ERR, EAL, \"Bad VFIO group fd\\n\");\n \t\t\tvfio_group_fd = -ENOENT;\n \t\t}\n \t}\n \n \tfree(mp_reply.msgs);\n \tif (vfio_group_fd < 0 && vfio_group_fd != -ENOENT)\n-\t\tRTE_LOG(ERR, EAL, \"  cannot request group fd\\n\");\n+\t\tRTE_LOG(ERR, EAL, \"Cannot request VFIO group fd\\n\");\n \treturn vfio_group_fd;\n }\n \n@@ -386,7 +387,8 @@ vfio_get_group_fd(struct vfio_config *vfio_cfg,\n \n \tvfio_group_fd = vfio_open_group_fd(iommu_group_num);\n \tif (vfio_group_fd < 0) {\n-\t\tRTE_LOG(ERR, EAL, \"Failed to open group %d\\n\", iommu_group_num);\n+\t\tRTE_LOG(ERR, EAL, \"Failed to open VFIO group %d\\n\",\n+\t\t\tiommu_group_num);\n \t\treturn vfio_group_fd;\n \t}\n \n@@ -465,13 +467,13 @@ vfio_group_device_get(int vfio_group_fd)\n \n \tvfio_cfg = get_vfio_cfg_by_group_fd(vfio_group_fd);\n \tif (vfio_cfg == NULL) {\n-\t\tRTE_LOG(ERR, EAL, \"  invalid group fd!\\n\");\n+\t\tRTE_LOG(ERR, EAL, \"Invalid VFIO group fd!\\n\");\n \t\treturn;\n \t}\n \n \ti = get_vfio_group_idx(vfio_group_fd);\n \tif (i < 0 || i > (VFIO_MAX_GROUPS - 1))\n-\t\tRTE_LOG(ERR, EAL, \"  wrong vfio_group index (%d)\\n\", i);\n+\t\tRTE_LOG(ERR, EAL, \"Wrong VFIO group index (%d)\\n\", i);\n \telse\n \t\tvfio_cfg->vfio_groups[i].devices++;\n }\n@@ -484,13 +486,13 @@ vfio_group_device_put(int vfio_group_fd)\n \n \tvfio_cfg = get_vfio_cfg_by_group_fd(vfio_group_fd);\n \tif (vfio_cfg == NULL) {\n-\t\tRTE_LOG(ERR, EAL, \"  invalid group fd!\\n\");\n+\t\tRTE_LOG(ERR, EAL, \"Invalid VFIO group fd!\\n\");\n \t\treturn;\n \t}\n \n \ti = get_vfio_group_idx(vfio_group_fd);\n \tif (i < 0 || i > (VFIO_MAX_GROUPS - 1))\n-\t\tRTE_LOG(ERR, EAL, \"  wrong vfio_group index (%d)\\n\", i);\n+\t\tRTE_LOG(ERR, EAL, \"Wrong VFIO group index (%d)\\n\", i);\n \telse\n \t\tvfio_cfg->vfio_groups[i].devices--;\n }\n@@ -503,13 +505,13 @@ vfio_group_device_count(int vfio_group_fd)\n \n \tvfio_cfg = get_vfio_cfg_by_group_fd(vfio_group_fd);\n \tif (vfio_cfg == NULL) {\n-\t\tRTE_LOG(ERR, EAL, \"  invalid group fd!\\n\");\n+\t\tRTE_LOG(ERR, EAL, \"Invalid VFIO group fd!\\n\");\n \t\treturn -1;\n \t}\n \n \ti = get_vfio_group_idx(vfio_group_fd);\n \tif (i < 0 || i > (VFIO_MAX_GROUPS - 1)) {\n-\t\tRTE_LOG(ERR, EAL, \"  wrong vfio_group index (%d)\\n\", i);\n+\t\tRTE_LOG(ERR, EAL, \"Wrong VFIO group index (%d)\\n\", i);\n \t\treturn -1;\n \t}\n \n@@ -550,8 +552,9 @@ vfio_mem_event_callback(enum rte_mem_event type, const void *addr, size_t len,\n \twhile (cur_len < len) {\n \t\t/* some memory segments may have invalid IOVA */\n \t\tif (ms->iova == RTE_BAD_IOVA) {\n-\t\t\tRTE_LOG(DEBUG, EAL, \"Memory segment at %p has bad IOVA, skipping\\n\",\n-\t\t\t\t\tms->addr);\n+\t\t\tRTE_LOG(DEBUG, EAL,\n+\t\t\t\t\"Memory segment at %p has bad IOVA, skipping\\n\",\n+\t\t\t\tms->addr);\n \t\t\tgoto next;\n \t\t}\n \t\tif (type == RTE_MEM_EVENT_ALLOC)\n@@ -603,7 +606,8 @@ vfio_sync_default_container(void)\n \t}\n \tfree(mp_reply.msgs);\n \tif (iommu_type_id < 0) {\n-\t\tRTE_LOG(ERR, EAL, \"Could not get IOMMU type for default container\\n\");\n+\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\"Could not get IOMMU type for default container\\n\");\n \t\treturn -1;\n \t}\n \n@@ -633,7 +637,7 @@ rte_vfio_clear_group(int vfio_group_fd)\n \n \tvfio_cfg = get_vfio_cfg_by_group_fd(vfio_group_fd);\n \tif (vfio_cfg == NULL) {\n-\t\tRTE_LOG(ERR, EAL, \"  invalid group fd!\\n\");\n+\t\tRTE_LOG(ERR, EAL, \"Invalid VFIO group fd!\\n\");\n \t\treturn -1;\n \t}\n \n@@ -668,8 +672,9 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,\n \t/* get group number */\n \tret = rte_vfio_get_group_num(sysfs_base, dev_addr, &iommu_group_num);\n \tif (ret == 0) {\n-\t\tRTE_LOG(WARNING, EAL, \"  %s not managed by VFIO driver, skipping\\n\",\n-\t\t\tdev_addr);\n+\t\tRTE_LOG(NOTICE, EAL,\n+\t\t\t\t\"%s not managed by VFIO driver, skipping\\n\",\n+\t\t\t\tdev_addr);\n \t\treturn 1;\n \t}\n \n@@ -687,7 +692,8 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,\n \t * isn't managed by VFIO\n \t */\n \tif (vfio_group_fd == -ENOENT) {\n-\t\tRTE_LOG(WARNING, EAL, \" %s not managed by VFIO driver, skipping\\n\",\n+\t\tRTE_LOG(NOTICE, EAL,\n+\t\t\t\t\"%s not managed by VFIO driver, skipping\\n\",\n \t\t\t\tdev_addr);\n \t\treturn 1;\n \t}\n@@ -700,15 +706,15 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,\n \t/* check if the group is viable */\n \tret = ioctl(vfio_group_fd, VFIO_GROUP_GET_STATUS, &group_status);\n \tif (ret) {\n-\t\tRTE_LOG(ERR, EAL, \"  %s cannot get group status, \"\n-\t\t\t\t\"error %i (%s)\\n\", dev_addr, errno, strerror(errno));\n+\t\tRTE_LOG(ERR, EAL, \"%s cannot get VFIO group status, \"\n+\t\t\t\"error %i (%s)\\n\", dev_addr, errno, strerror(errno));\n \t\tclose(vfio_group_fd);\n \t\trte_vfio_clear_group(vfio_group_fd);\n \t\treturn -1;\n \t} else if (!(group_status.flags & VFIO_GROUP_FLAGS_VIABLE)) {\n-\t\tRTE_LOG(ERR, EAL, \"  %s VFIO group is not viable! \"\n-\t\t\t\t\"Not all devices in IOMMU group bound to VFIO or unbound\\n\",\n-\t\t\t\tdev_addr);\n+\t\tRTE_LOG(ERR, EAL, \"%s VFIO group is not viable! \"\n+\t\t\t\"Not all devices in IOMMU group bound to VFIO or unbound\\n\",\n+\t\t\tdev_addr);\n \t\tclose(vfio_group_fd);\n \t\trte_vfio_clear_group(vfio_group_fd);\n \t\treturn -1;\n@@ -727,8 +733,9 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,\n \t\tret = ioctl(vfio_group_fd, VFIO_GROUP_SET_CONTAINER,\n \t\t\t\t&vfio_container_fd);\n \t\tif (ret) {\n-\t\t\tRTE_LOG(ERR, EAL, \"  %s cannot add VFIO group to container, \"\n-\t\t\t\t\t\"error %i (%s)\\n\", dev_addr, errno, strerror(errno));\n+\t\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\t\"%s cannot add VFIO group to container, error \"\n+\t\t\t\t\"%i (%s)\\n\", dev_addr, errno, strerror(errno));\n \t\t\tclose(vfio_group_fd);\n \t\t\trte_vfio_clear_group(vfio_group_fd);\n \t\t\treturn -1;\n@@ -751,7 +758,7 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,\n \t\t\tt = vfio_set_iommu_type(vfio_container_fd);\n \t\t\tif (!t) {\n \t\t\t\tRTE_LOG(ERR, EAL,\n-\t\t\t\t\t\"  %s failed to select IOMMU type\\n\",\n+\t\t\t\t\t\"%s failed to select IOMMU type\\n\",\n \t\t\t\t\tdev_addr);\n \t\t\t\tclose(vfio_group_fd);\n \t\t\t\trte_vfio_clear_group(vfio_group_fd);\n@@ -767,7 +774,8 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,\n \t\t\t\tret = 0;\n \t\t\tif (ret) {\n \t\t\t\tRTE_LOG(ERR, EAL,\n-\t\t\t\t\t\"  %s DMA remapping failed, error %i (%s)\\n\",\n+\t\t\t\t\t\"%s DMA remapping failed, error \"\n+\t\t\t\t\t\"%i (%s)\\n\",\n \t\t\t\t\tdev_addr, errno, strerror(errno));\n \t\t\t\tclose(vfio_group_fd);\n \t\t\t\trte_vfio_clear_group(vfio_group_fd);\n@@ -845,7 +853,7 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,\n \t\t/* we have successfully initialized VFIO, notify user */\n \t\tconst struct vfio_iommu_type *t =\n \t\t\t\tdefault_vfio_cfg->vfio_iommu_type;\n-\t\tRTE_LOG(INFO, EAL, \"  using IOMMU type %d (%s)\\n\",\n+\t\tRTE_LOG(INFO, EAL, \"Using IOMMU type %d (%s)\\n\",\n \t\t\t\tt->type_id, t->name);\n \t}\n \n@@ -884,7 +892,7 @@ rte_vfio_setup_device(const char *sysfs_base, const char *dev_addr,\n dev_get_info:\n \tret = ioctl(*vfio_dev_fd, VFIO_DEVICE_GET_INFO, device_info);\n \tif (ret) {\n-\t\tRTE_LOG(ERR, EAL, \"  %s cannot get device info, \"\n+\t\tRTE_LOG(ERR, EAL, \"%s cannot get device info, \"\n \t\t\t\t\"error %i (%s)\\n\", dev_addr, errno,\n \t\t\t\tstrerror(errno));\n \t\tclose(*vfio_dev_fd);\n@@ -915,7 +923,7 @@ rte_vfio_release_device(const char *sysfs_base, const char *dev_addr,\n \t/* get group number */\n \tret = rte_vfio_get_group_num(sysfs_base, dev_addr, &iommu_group_num);\n \tif (ret <= 0) {\n-\t\tRTE_LOG(WARNING, EAL, \"  %s not managed by VFIO driver\\n\",\n+\t\tRTE_LOG(WARNING, EAL, \"%s not managed by VFIO driver\\n\",\n \t\t\tdev_addr);\n \t\t/* This is an error at this point. */\n \t\tret = -1;\n@@ -1009,8 +1017,7 @@ rte_vfio_enable(const char *modname)\n \t\t}\n \t}\n \n-\t/* inform the user that we are probing for VFIO */\n-\tRTE_LOG(INFO, EAL, \"Probing VFIO support...\\n\");\n+\tRTE_LOG(DEBUG, EAL, \"Probing VFIO support...\\n\");\n \n \t/* check if vfio module is loaded */\n \tvfio_available = rte_eal_check_module(modname);\n@@ -1023,8 +1030,8 @@ rte_vfio_enable(const char *modname)\n \n \t/* return 0 if VFIO modules not loaded */\n \tif (vfio_available == 0) {\n-\t\tRTE_LOG(DEBUG, EAL, \"VFIO modules not loaded, \"\n-\t\t\t\"skipping VFIO support...\\n\");\n+\t\tRTE_LOG(DEBUG, EAL,\n+\t\t\t\"VFIO modules not loaded, skipping VFIO support...\\n\");\n \t\treturn 0;\n \t}\n \n@@ -1095,7 +1102,7 @@ vfio_get_default_container_fd(void)\n \t}\n \n \tfree(mp_reply.msgs);\n-\tRTE_LOG(ERR, EAL, \"  cannot request default container fd\\n\");\n+\tRTE_LOG(ERR, EAL, \"Cannot request default VFIO container fd\\n\");\n \treturn -1;\n }\n \n@@ -1118,13 +1125,13 @@ vfio_set_iommu_type(int vfio_container_fd)\n \t\tint ret = ioctl(vfio_container_fd, VFIO_SET_IOMMU,\n \t\t\t\tt->type_id);\n \t\tif (!ret) {\n-\t\t\tRTE_LOG(INFO, EAL, \"  using IOMMU type %d (%s)\\n\",\n+\t\t\tRTE_LOG(INFO, EAL, \"Using IOMMU type %d (%s)\\n\",\n \t\t\t\t\tt->type_id, t->name);\n \t\t\treturn t;\n \t\t}\n \t\t/* not an error, there may be more supported IOMMU types */\n-\t\tRTE_LOG(DEBUG, EAL, \"  set IOMMU type %d (%s) failed, \"\n-\t\t\t\t\"error %i (%s)\\n\", t->type_id, t->name, errno,\n+\t\tRTE_LOG(DEBUG, EAL, \"Set IOMMU type %d (%s) failed, error \"\n+\t\t\t\t\"%i (%s)\\n\", t->type_id, t->name, errno,\n \t\t\t\tstrerror(errno));\n \t}\n \t/* if we didn't find a suitable IOMMU type, fail */\n@@ -1142,16 +1149,15 @@ vfio_has_supported_extensions(int vfio_container_fd)\n \t\tret = ioctl(vfio_container_fd, VFIO_CHECK_EXTENSION,\n \t\t\t\tt->type_id);\n \t\tif (ret < 0) {\n-\t\t\tRTE_LOG(ERR, EAL, \"  could not get IOMMU type, \"\n-\t\t\t\t\"error %i (%s)\\n\", errno,\n-\t\t\t\tstrerror(errno));\n+\t\t\tRTE_LOG(ERR, EAL, \"Could not get IOMMU type, error \"\n+\t\t\t\t\t\"%i (%s)\\n\", errno, strerror(errno));\n \t\t\tclose(vfio_container_fd);\n \t\t\treturn -1;\n \t\t} else if (ret == 1) {\n \t\t\t/* we found a supported extension */\n \t\t\tn_extensions++;\n \t\t}\n-\t\tRTE_LOG(DEBUG, EAL, \"  IOMMU type %d (%s) is %s\\n\",\n+\t\tRTE_LOG(DEBUG, EAL, \"IOMMU type %d (%s) is %s\\n\",\n \t\t\t\tt->type_id, t->name,\n \t\t\t\tret ? \"supported\" : \"not supported\");\n \t}\n@@ -1181,8 +1187,10 @@ rte_vfio_get_container_fd(void)\n \tif (internal_conf->process_type == RTE_PROC_PRIMARY) {\n \t\tvfio_container_fd = open(VFIO_CONTAINER_PATH, O_RDWR);\n \t\tif (vfio_container_fd < 0) {\n-\t\t\tRTE_LOG(ERR, EAL, \"  cannot open VFIO container, \"\n-\t\t\t\t\t\"error %i (%s)\\n\", errno, strerror(errno));\n+\t\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\t\t\"Cannot open VFIO container %s, error \"\n+\t\t\t\t\t\"%i (%s)\\n\", VFIO_CONTAINER_PATH,\n+\t\t\t\t\terrno, strerror(errno));\n \t\t\treturn -1;\n \t\t}\n \n@@ -1190,18 +1198,19 @@ rte_vfio_get_container_fd(void)\n \t\tret = ioctl(vfio_container_fd, VFIO_GET_API_VERSION);\n \t\tif (ret != VFIO_API_VERSION) {\n \t\t\tif (ret < 0)\n-\t\t\t\tRTE_LOG(ERR, EAL, \"  could not get VFIO API version, \"\n-\t\t\t\t\t\t\"error %i (%s)\\n\", errno, strerror(errno));\n+\t\t\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\t\t\"Could not get VFIO API version, error \"\n+\t\t\t\t\t\"%i (%s)\\n\", errno, strerror(errno));\n \t\t\telse\n-\t\t\t\tRTE_LOG(ERR, EAL, \"  unsupported VFIO API version!\\n\");\n+\t\t\t\tRTE_LOG(ERR, EAL, \"Unsupported VFIO API version!\\n\");\n \t\t\tclose(vfio_container_fd);\n \t\t\treturn -1;\n \t\t}\n \n \t\tret = vfio_has_supported_extensions(vfio_container_fd);\n \t\tif (ret) {\n-\t\t\tRTE_LOG(ERR, EAL, \"  no supported IOMMU \"\n-\t\t\t\t\t\"extensions found!\\n\");\n+\t\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\t\"No supported IOMMU extensions found!\\n\");\n \t\t\treturn -1;\n \t\t}\n \n@@ -1229,7 +1238,7 @@ rte_vfio_get_container_fd(void)\n \t}\n \n \tfree(mp_reply.msgs);\n-\tRTE_LOG(ERR, EAL, \"  cannot request container fd\\n\");\n+\tRTE_LOG(ERR, EAL, \"Cannot request VFIO container fd\\n\");\n \treturn -1;\n }\n \n@@ -1259,7 +1268,7 @@ rte_vfio_get_group_num(const char *sysfs_base,\n \t\t\ttok, RTE_DIM(tok), '/');\n \n \tif (ret <= 0) {\n-\t\tRTE_LOG(ERR, EAL, \"  %s cannot get IOMMU group\\n\", dev_addr);\n+\t\tRTE_LOG(ERR, EAL, \"%s cannot get IOMMU group\\n\", dev_addr);\n \t\treturn -1;\n \t}\n \n@@ -1269,7 +1278,7 @@ rte_vfio_get_group_num(const char *sysfs_base,\n \tend = group_tok;\n \t*iommu_group_num = strtol(group_tok, &end, 10);\n \tif ((end != group_tok && *end != '\\0') || errno != 0) {\n-\t\tRTE_LOG(ERR, EAL, \"  %s error parsing IOMMU number!\\n\", dev_addr);\n+\t\tRTE_LOG(ERR, EAL, \"%s error parsing IOMMU number!\\n\", dev_addr);\n \t\treturn -1;\n \t}\n \n@@ -1336,13 +1345,11 @@ vfio_type1_dma_mem_map(int vfio_container_fd, uint64_t vaddr, uint64_t iova,\n \t\t\t */\n \t\t\tif (errno == EEXIST) {\n \t\t\t\tRTE_LOG(DEBUG, EAL,\n-\t\t\t\t\t\" Memory segment is already mapped,\"\n-\t\t\t\t\t\" skipping\");\n+\t\t\t\t\t\"Memory segment is already mapped, skipping\");\n \t\t\t} else {\n \t\t\t\tRTE_LOG(ERR, EAL,\n-\t\t\t\t\t\"  cannot set up DMA remapping,\"\n-\t\t\t\t\t\" error %i (%s)\\n\",\n-\t\t\t\t\terrno, strerror(errno));\n+\t\t\t\t\t\"Cannot set up DMA remapping, error \"\n+\t\t\t\t\t\"%i (%s)\\n\", errno, strerror(errno));\n \t\t\t\treturn -1;\n \t\t\t}\n \t\t}\n@@ -1355,12 +1362,12 @@ vfio_type1_dma_mem_map(int vfio_container_fd, uint64_t vaddr, uint64_t iova,\n \t\tret = ioctl(vfio_container_fd, VFIO_IOMMU_UNMAP_DMA,\n \t\t\t\t&dma_unmap);\n \t\tif (ret) {\n-\t\t\tRTE_LOG(ERR, EAL, \"  cannot clear DMA remapping, error %i (%s)\\n\",\n-\t\t\t\t\terrno, strerror(errno));\n+\t\t\tRTE_LOG(ERR, EAL, \"Cannot clear DMA remapping, error \"\n+\t\t\t\t\t\"%i (%s)\\n\", errno, strerror(errno));\n \t\t\treturn -1;\n \t\t} else if (dma_unmap.size != len) {\n-\t\t\tRTE_LOG(ERR, EAL, \"  unexpected size %\"PRIu64\" of DMA \"\n-\t\t\t\t\"remapping cleared instead of %\"PRIu64\"\\n\",\n+\t\t\tRTE_LOG(ERR, EAL, \"Unexpected size %\"PRIu64\n+\t\t\t\t\" of DMA remapping cleared instead of %\"PRIu64\"\\n\",\n \t\t\t\t(uint64_t)dma_unmap.size, len);\n \t\t\trte_errno = EIO;\n \t\t\treturn -1;\n@@ -1408,15 +1415,16 @@ vfio_spapr_dma_do_map(int vfio_container_fd, uint64_t vaddr, uint64_t iova,\n \t\tstruct vfio_iommu_type1_dma_map dma_map;\n \n \t\tif (iova + len > spapr_dma_win_len) {\n-\t\t\tRTE_LOG(ERR, EAL, \"  dma map attempt outside DMA window\\n\");\n+\t\t\tRTE_LOG(ERR, EAL, \"DMA map attempt outside DMA window\\n\");\n \t\t\treturn -1;\n \t\t}\n \n \t\tret = ioctl(vfio_container_fd,\n \t\t\t\tVFIO_IOMMU_SPAPR_REGISTER_MEMORY, &reg);\n \t\tif (ret) {\n-\t\t\tRTE_LOG(ERR, EAL, \"  cannot register vaddr for IOMMU, \"\n-\t\t\t\t\"error %i (%s)\\n\", errno, strerror(errno));\n+\t\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\t\"Cannot register vaddr for IOMMU, error \"\n+\t\t\t\t\"%i (%s)\\n\", errno, strerror(errno));\n \t\t\treturn -1;\n \t\t}\n \n@@ -1430,8 +1438,8 @@ vfio_spapr_dma_do_map(int vfio_container_fd, uint64_t vaddr, uint64_t iova,\n \n \t\tret = ioctl(vfio_container_fd, VFIO_IOMMU_MAP_DMA, &dma_map);\n \t\tif (ret) {\n-\t\t\tRTE_LOG(ERR, EAL, \"  cannot map vaddr for IOMMU, error %i (%s)\\n\",\n-\t\t\t\terrno, strerror(errno));\n+\t\t\tRTE_LOG(ERR, EAL, \"Cannot map vaddr for IOMMU, error \"\n+\t\t\t\t\t\"%i (%s)\\n\", errno, strerror(errno));\n \t\t\treturn -1;\n \t\t}\n \n@@ -1446,16 +1454,17 @@ vfio_spapr_dma_do_map(int vfio_container_fd, uint64_t vaddr, uint64_t iova,\n \t\tret = ioctl(vfio_container_fd, VFIO_IOMMU_UNMAP_DMA,\n \t\t\t\t&dma_unmap);\n \t\tif (ret) {\n-\t\t\tRTE_LOG(ERR, EAL, \"  cannot unmap vaddr for IOMMU, error %i (%s)\\n\",\n-\t\t\t\terrno, strerror(errno));\n+\t\t\tRTE_LOG(ERR, EAL, \"Cannot unmap vaddr for IOMMU, error \"\n+\t\t\t\t\t\"%i (%s)\\n\", errno, strerror(errno));\n \t\t\treturn -1;\n \t\t}\n \n \t\tret = ioctl(vfio_container_fd,\n \t\t\t\tVFIO_IOMMU_SPAPR_UNREGISTER_MEMORY, &reg);\n \t\tif (ret) {\n-\t\t\tRTE_LOG(ERR, EAL, \"  cannot unregister vaddr for IOMMU, error %i (%s)\\n\",\n-\t\t\t\terrno, strerror(errno));\n+\t\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\t\"Cannot unregister vaddr for IOMMU, error \"\n+\t\t\t\t\"%i (%s)\\n\", errno, strerror(errno));\n \t\t\treturn -1;\n \t\t}\n \t}\n@@ -1639,7 +1648,7 @@ vfio_spapr_create_dma_window(int vfio_container_fd)\n \n \tret = ioctl(vfio_container_fd, VFIO_IOMMU_SPAPR_TCE_GET_INFO, &info);\n \tif (ret) {\n-\t\tRTE_LOG(ERR, EAL, \"  can't get iommu info, error %i (%s)\\n\",\n+\t\tRTE_LOG(ERR, EAL, \"Cannot get IOMMU info, error %i (%s)\\n\",\n \t\t\terrno, strerror(errno));\n \t\treturn -1;\n \t}\n@@ -1680,16 +1689,16 @@ vfio_spapr_create_dma_window(int vfio_container_fd)\n \t}\n #endif /* VFIO_IOMMU_SPAPR_INFO_DDW */\n \tif (ret) {\n-\t\tRTE_LOG(ERR, EAL, \"  cannot create new DMA window, error %i (%s)\\n\",\n-\t\t\terrno, strerror(errno));\n-\t\tRTE_LOG(ERR, EAL, \"  consider using a larger hugepage size \"\n-\t\t\t\"if supported by the system\\n\");\n+\t\tRTE_LOG(ERR, EAL, \"Cannot create new DMA window, error \"\n+\t\t\t\t\"%i (%s)\\n\", errno, strerror(errno));\n+\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\"Consider using a larger hugepage size if supported by the system\\n\");\n \t\treturn -1;\n \t}\n \n \t/* verify the start address  */\n \tif (create.start_addr != 0) {\n-\t\tRTE_LOG(ERR, EAL, \"  received unsupported start address 0x%\"\n+\t\tRTE_LOG(ERR, EAL, \"Received unsupported start address 0x%\"\n \t\t\tPRIx64 \"\\n\", (uint64_t)create.start_addr);\n \t\treturn -1;\n \t}\n@@ -1758,14 +1767,14 @@ vfio_dma_mem_map(struct vfio_config *vfio_cfg, uint64_t vaddr, uint64_t iova,\n \tconst struct vfio_iommu_type *t = vfio_cfg->vfio_iommu_type;\n \n \tif (!t) {\n-\t\tRTE_LOG(ERR, EAL, \"  VFIO support not initialized\\n\");\n+\t\tRTE_LOG(ERR, EAL, \"VFIO support not initialized\\n\");\n \t\trte_errno = ENODEV;\n \t\treturn -1;\n \t}\n \n \tif (!t->dma_user_map_func) {\n \t\tRTE_LOG(ERR, EAL,\n-\t\t\t\"  VFIO custom DMA region maping not supported by IOMMU %s\\n\",\n+\t\t\t\"VFIO custom DMA region maping not supported by IOMMU %s\\n\",\n \t\t\tt->name);\n \t\trte_errno = ENOTSUP;\n \t\treturn -1;\n@@ -1904,8 +1913,8 @@ rte_vfio_noiommu_is_enabled(void)\n \tfd = open(VFIO_NOIOMMU_MODE, O_RDONLY);\n \tif (fd < 0) {\n \t\tif (errno != ENOENT) {\n-\t\t\tRTE_LOG(ERR, EAL, \"  cannot open vfio noiommu file %i (%s)\\n\",\n-\t\t\t\t\terrno, strerror(errno));\n+\t\t\tRTE_LOG(ERR, EAL, \"Cannot open VFIO noiommu file \"\n+\t\t\t\t\t\"%i (%s)\\n\", errno, strerror(errno));\n \t\t\treturn -1;\n \t\t}\n \t\t/*\n@@ -1918,8 +1927,8 @@ rte_vfio_noiommu_is_enabled(void)\n \tcnt = read(fd, &c, 1);\n \tclose(fd);\n \tif (cnt != 1) {\n-\t\tRTE_LOG(ERR, EAL, \"  unable to read from vfio noiommu \"\n-\t\t\t\t\"file %i (%s)\\n\", errno, strerror(errno));\n+\t\tRTE_LOG(ERR, EAL, \"Unable to read from VFIO noiommu file \"\n+\t\t\t\t\"%i (%s)\\n\", errno, strerror(errno));\n \t\treturn -1;\n \t}\n \n@@ -1938,13 +1947,13 @@ rte_vfio_container_create(void)\n \t}\n \n \tif (i == VFIO_MAX_CONTAINERS) {\n-\t\tRTE_LOG(ERR, EAL, \"exceed max vfio container limit\\n\");\n+\t\tRTE_LOG(ERR, EAL, \"Exceed max VFIO container limit\\n\");\n \t\treturn -1;\n \t}\n \n \tvfio_cfgs[i].vfio_container_fd = rte_vfio_get_container_fd();\n \tif (vfio_cfgs[i].vfio_container_fd < 0) {\n-\t\tRTE_LOG(NOTICE, EAL, \"fail to create a new container\\n\");\n+\t\tRTE_LOG(NOTICE, EAL, \"Fail to create a new VFIO container\\n\");\n \t\treturn -1;\n \t}\n \n@@ -1959,7 +1968,7 @@ rte_vfio_container_destroy(int container_fd)\n \n \tvfio_cfg = get_vfio_cfg_by_container_fd(container_fd);\n \tif (vfio_cfg == NULL) {\n-\t\tRTE_LOG(ERR, EAL, \"Invalid container fd\\n\");\n+\t\tRTE_LOG(ERR, EAL, \"Invalid VFIO container fd\\n\");\n \t\treturn -1;\n \t}\n \n@@ -1983,7 +1992,7 @@ rte_vfio_container_group_bind(int container_fd, int iommu_group_num)\n \n \tvfio_cfg = get_vfio_cfg_by_container_fd(container_fd);\n \tif (vfio_cfg == NULL) {\n-\t\tRTE_LOG(ERR, EAL, \"Invalid container fd\\n\");\n+\t\tRTE_LOG(ERR, EAL, \"Invalid VFIO container fd\\n\");\n \t\treturn -1;\n \t}\n \n@@ -1999,7 +2008,7 @@ rte_vfio_container_group_unbind(int container_fd, int iommu_group_num)\n \n \tvfio_cfg = get_vfio_cfg_by_container_fd(container_fd);\n \tif (vfio_cfg == NULL) {\n-\t\tRTE_LOG(ERR, EAL, \"Invalid container fd\\n\");\n+\t\tRTE_LOG(ERR, EAL, \"Invalid VFIO container fd\\n\");\n \t\treturn -1;\n \t}\n \n@@ -2012,13 +2021,14 @@ rte_vfio_container_group_unbind(int container_fd, int iommu_group_num)\n \n \t/* This should not happen */\n \tif (i == VFIO_MAX_GROUPS || cur_grp == NULL) {\n-\t\tRTE_LOG(ERR, EAL, \"Specified group number not found\\n\");\n+\t\tRTE_LOG(ERR, EAL, \"Specified VFIO group number not found\\n\");\n \t\treturn -1;\n \t}\n \n \tif (cur_grp->fd >= 0 && close(cur_grp->fd) < 0) {\n-\t\tRTE_LOG(ERR, EAL, \"Error when closing vfio_group_fd for\"\n-\t\t\t\" iommu_group_num %d\\n\", iommu_group_num);\n+\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\"Error when closing vfio_group_fd for iommu_group_num \"\n+\t\t\t\"%d\\n\", iommu_group_num);\n \t\treturn -1;\n \t}\n \tcur_grp->group_num = -1;\n@@ -2042,7 +2052,7 @@ rte_vfio_container_dma_map(int container_fd, uint64_t vaddr, uint64_t iova,\n \n \tvfio_cfg = get_vfio_cfg_by_container_fd(container_fd);\n \tif (vfio_cfg == NULL) {\n-\t\tRTE_LOG(ERR, EAL, \"Invalid container fd\\n\");\n+\t\tRTE_LOG(ERR, EAL, \"Invalid VFIO container fd\\n\");\n \t\treturn -1;\n \t}\n \n@@ -2062,7 +2072,7 @@ rte_vfio_container_dma_unmap(int container_fd, uint64_t vaddr, uint64_t iova,\n \n \tvfio_cfg = get_vfio_cfg_by_container_fd(container_fd);\n \tif (vfio_cfg == NULL) {\n-\t\tRTE_LOG(ERR, EAL, \"Invalid container fd\\n\");\n+\t\tRTE_LOG(ERR, EAL, \"Invalid VFIO container fd\\n\");\n \t\treturn -1;\n \t}\n \n",
    "prefixes": []
}