Patch Detail

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

{
    "id": 1317,
    "url": "https://patches.dpdk.org/api/patches/1317/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/1416204364-4149-1-git-send-email-mukawa@igel.co.jp/",
    "project": {
        "id": 1,
        "url": "https://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": "<1416204364-4149-1-git-send-email-mukawa@igel.co.jp>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1416204364-4149-1-git-send-email-mukawa@igel.co.jp",
    "date": "2014-11-17T06:06:04",
    "name": "[dpdk-dev,RFC] lib/librte_vhost: cleanup white spaces, tabs and indents",
    "commit_ref": null,
    "pull_url": null,
    "state": "rfc",
    "archived": true,
    "hash": "10498128ffbc1b6c69aa346d9b432a91e84fee9b",
    "submitter": {
        "id": 64,
        "url": "https://patches.dpdk.org/api/people/64/?format=api",
        "name": "Tetsuya Mukawa",
        "email": "mukawa@igel.co.jp"
    },
    "delegate": null,
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/1416204364-4149-1-git-send-email-mukawa@igel.co.jp/mbox/",
    "series": [],
    "comments": "https://patches.dpdk.org/api/patches/1317/comments/",
    "check": "pending",
    "checks": "https://patches.dpdk.org/api/patches/1317/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 0BBD67FA0;\n\tMon, 17 Nov 2014 06:56:13 +0100 (CET)",
            "from mail-pa0-f43.google.com (mail-pa0-f43.google.com\n\t[209.85.220.43]) by dpdk.org (Postfix) with ESMTP id 9272A7F7D\n\tfor <dev@dpdk.org>; Mon, 17 Nov 2014 06:56:10 +0100 (CET)",
            "by mail-pa0-f43.google.com with SMTP id kx10so1348050pab.2\n\tfor <dev@dpdk.org>; Sun, 16 Nov 2014 22:06:25 -0800 (PST)",
            "from localhost.localdomain (napt.igel.co.jp. [219.106.231.132])\n\tby mx.google.com with ESMTPSA id\n\txy3sm33897478pbb.38.2014.11.16.22.06.23 for <multiple recipients>\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tSun, 16 Nov 2014 22:06:24 -0800 (PST)"
        ],
        "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:in-reply-to\n\t:references;\n\tbh=yGuZ+g52dP2aicUxrT5X5IJ3QgAHhCaSTXRcB1Dfv70=;\n\tb=Qr+d0WnTqGjfnYoFX1tf4Frb2hi+Cab+yCMHTfq1lP4C2LI1c0ntbUm0cNALeSIpxw\n\tKWAuszAoobNGtqFsLmie95No9w1UQUUyIIWiAGi8/JbBHEQfOH+CcSG4/Ns6l0ecad4T\n\t9QG2OFcdR2pZYp0IWRI1JXFkwTGFvnswL6+HuAHyS5JbcGjfphoeATN57TzBVvoQGGHm\n\tFqyVfqOHyQapPlFFaaJQge2e9jxu+fKN8WmJJo8RnG1Jg7KbdnUxxhnvN+vFLBcZcf9X\n\tbF5JXTZMSeZJ++BBY5ic+El9bXmIxyCIV7cXiJ8DwuzKSDCjN+qSUtDVwePfbJgxa8fz\n\t8gSg==",
        "X-Gm-Message-State": "ALoCoQlbBg9nNqXLL5kKbB4xJ6cIkfrgHpP1Xg6bXKcmGvGf7tV2d11d3Q9lAaGgmPL/o/jnI1t0",
        "X-Received": "by 10.68.93.1 with SMTP id cq1mr1329497pbb.145.1416204384950;\n\tSun, 16 Nov 2014 22:06:24 -0800 (PST)",
        "From": "Tetsuya Mukawa <mukawa@igel.co.jp>",
        "To": "dev@dpdk.org",
        "Date": "Mon, 17 Nov 2014 15:06:04 +0900",
        "Message-Id": "<1416204364-4149-1-git-send-email-mukawa@igel.co.jp>",
        "X-Mailer": "git-send-email 1.9.1",
        "In-Reply-To": "<1416014087-22499-1-git-send-email-huawei.xie@intel.com>",
        "References": "<1416014087-22499-1-git-send-email-huawei.xie@intel.com>",
        "Subject": "[dpdk-dev] [RFC PATCH] lib/librte_vhost: cleanup white spaces,\n\ttabs and indents",
        "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": "---\n lib/librte_vhost/rte_virtio_net.h             |  4 +--\n lib/librte_vhost/vhost-cuse/vhost-net-cdev.c  |  4 +--\n lib/librte_vhost/vhost-cuse/virtio-net-cdev.c |  8 ++---\n lib/librte_vhost/vhost-user/fd_man.c          | 13 ++++----\n lib/librte_vhost/vhost-user/fd_man.h          |  2 +-\n lib/librte_vhost/vhost-user/vhost-net-user.c  | 37 +++++++++++-----------\n lib/librte_vhost/vhost-user/virtio-net-user.c | 44 +++++++++++++--------------\n lib/librte_vhost/vhost_rxtx.c                 |  2 +-\n lib/librte_vhost/virtio-net.c                 | 10 +++---\n 9 files changed, 61 insertions(+), 63 deletions(-)",
    "diff": "diff --git a/lib/librte_vhost/rte_virtio_net.h b/lib/librte_vhost/rte_virtio_net.h\nindex 7a05dab..7d7d001 100644\n--- a/lib/librte_vhost/rte_virtio_net.h\n+++ b/lib/librte_vhost/rte_virtio_net.h\n@@ -140,12 +140,12 @@ gpa_to_vva(struct virtio_net *dev, uint64_t guest_pa)\n }\n \n /**\n- *  Disable features in feature_mask. Returns 0 on success.\n+ * Disable features in feature_mask. Returns 0 on success.\n  */\n int rte_vhost_feature_disable(uint64_t feature_mask);\n \n /**\n- *  Enable features in feature_mask. Returns 0 on success.\n+ * Enable features in feature_mask. Returns 0 on success.\n  */\n int rte_vhost_feature_enable(uint64_t feature_mask);\n \ndiff --git a/lib/librte_vhost/vhost-cuse/vhost-net-cdev.c b/lib/librte_vhost/vhost-cuse/vhost-net-cdev.c\nindex 4671643..688ec00 100644\n--- a/lib/librte_vhost/vhost-cuse/vhost-net-cdev.c\n+++ b/lib/librte_vhost/vhost-cuse/vhost-net-cdev.c\n@@ -329,7 +329,7 @@ vhost_net_ioctl(fuse_req_t req, int cmd, void *arg,\n \t\t} else {\n \t\t\tint fd;\n \t\t\tfile = *(const struct vhost_vring_file *)in_buf;\n-\t\t\tLOG_DEBUG(VHOST_CONFIG, \n+\t\t\tLOG_DEBUG(VHOST_CONFIG,\n \t\t\t\t\"kick/call idx:%d fd:%d\\n\", file.index, file.fd);\n \t\t\tif ((fd = eventfd_copy(file.fd, ctx.pid)) < 0){\n \t\t\t\tfuse_reply_ioctl(req, -1, NULL, 0);\n@@ -338,7 +338,7 @@ vhost_net_ioctl(fuse_req_t req, int cmd, void *arg,\n \t\t\tif (cmd == VHOST_SET_VRING_KICK) {\n \t\t\t\tVHOST_IOCTL_R(struct vhost_vring_file, file, ops->set_vring_call);\n \t\t\t}\n-\t\t\telse { \n+\t\t\telse {\n \t\t\t\tVHOST_IOCTL_R(struct vhost_vring_file, file, ops->set_vring_kick);\n \t\t\t}\n \t\t}\ndiff --git a/lib/librte_vhost/vhost-cuse/virtio-net-cdev.c b/lib/librte_vhost/vhost-cuse/virtio-net-cdev.c\nindex 5c16aa5..7381140 100644\n--- a/lib/librte_vhost/vhost-cuse/virtio-net-cdev.c\n+++ b/lib/librte_vhost/vhost-cuse/virtio-net-cdev.c\n@@ -288,7 +288,7 @@ cuse_set_mem_table(struct vhost_device_ctx ctx, const struct vhost_memory *mem_r\n \t\t\tbase_address =\n \t\t\t\tregions[idx].userspace_address;\n \t\t\t/* Map VM memory file */\n-\t\t\tif (host_memory_map(ctx.pid, base_address, \n+\t\t\tif (host_memory_map(ctx.pid, base_address,\n \t\t\t\t&mapped_address, &mapped_size) != 0) {\n \t\t\t\treturn -1;\n \t\t\t}\n@@ -297,18 +297,18 @@ cuse_set_mem_table(struct vhost_device_ctx ctx, const struct vhost_memory *mem_r\n \n \t/* Check that we have a valid base address. */\n \tif (base_address == 0) {\n-\t\tRTE_LOG(ERR, VHOST_CONFIG, \n+\t\tRTE_LOG(ERR, VHOST_CONFIG,\n \t\t\t\"Failed to find base address of qemu memory file.\\n\");\n \t\treturn -1;\n \t}\n \n \tfor (idx = 0; idx < nregions; idx++) {\n-\t\tregions[idx].address_offset = \n+\t\tregions[idx].address_offset =\n \t\t\tmapped_address - base_address +\n \t\t\tregions[idx].userspace_address -\n \t\t\tregions[idx].guest_phys_address;\n \t}\n-\t\n+\n \tops->set_mem_table(ctx, &regions[0], nregions);\n \treturn 0;\n }\ndiff --git a/lib/librte_vhost/vhost-user/fd_man.c b/lib/librte_vhost/vhost-user/fd_man.c\nindex c7fd3f2..cbc656b 100644\n--- a/lib/librte_vhost/vhost-user/fd_man.c\n+++ b/lib/librte_vhost/vhost-user/fd_man.c\n@@ -15,7 +15,7 @@\n  * Returns the index in the fdset for a fd.\n  * If fd is -1, it means to search for a free entry.\n  * @return\n- *   Index for the fd, or -1 if fd isn't in the fdset.\n+ *  Index for the fd, or -1 if fd isn't in the fdset.\n  */\n static int\n fdset_find_fd(struct fdset *pfdset, int fd)\n@@ -23,8 +23,8 @@ fdset_find_fd(struct fdset *pfdset, int fd)\n \tint i;\n \n \tfor (i = 0; i < pfdset->num && pfdset->fd[i].fd != fd; i++);\n-\t\t\n-\treturn i ==  pfdset->num ? -1 : i;\n+\n+\treturn i == pfdset->num ? -1 : i;\n }\n \n static int\n@@ -35,7 +35,7 @@ fdset_find_free_slot(struct fdset *pfdset)\n }\n \n static void\n-fdset_add_fd(struct fdset  *pfdset, int idx, int fd, fd_cb rcb, \n+fdset_add_fd(struct fdset *pfdset, int idx, int fd, fd_cb rcb,\n \t\tfd_cb wcb, uint64_t dat)\n {\n \tstruct fdentry *pfdentry = &pfdset->fd[idx];\n@@ -111,7 +111,7 @@ fdset_add(struct fdset *pfdset, int fd, fd_cb rcb, fd_cb wcb, uint64_t dat)\n }\n \n /**\n- *  Unregister the fd from the fdset.\n+ * Unregister the fd from the fdset.\n  */\n void\n fdset_del(struct fdset *pfdset, int fd)\n@@ -148,11 +148,10 @@ fdset_event_dispatch(struct fdset *pfdset)\n \n \t\tfor (i = 0; i < num; i++) {\n \t\t\tpfdentry = &pfdset->fd[i];\n-\t\t\tif (FD_ISSET(pfdentry->fd, &rfds)) \n+\t\t\tif (FD_ISSET(pfdentry->fd, &rfds))\n \t\t\t\tpfdentry->rcb(pfdentry->fd, pfdentry->dat);\n \t\t\tif (FD_ISSET(pfdentry->fd, &wfds))\n \t\t\t\tpfdentry->wcb(pfdentry->fd, pfdentry->dat);\n \t\t}\n-\t\t\n \t}\n }\ndiff --git a/lib/librte_vhost/vhost-user/fd_man.h b/lib/librte_vhost/vhost-user/fd_man.h\nindex 57cc81d..8df17b4 100644\n--- a/lib/librte_vhost/vhost-user/fd_man.h\n+++ b/lib/librte_vhost/vhost-user/fd_man.h\n@@ -15,7 +15,7 @@ struct fdentry {\n \n struct fdset {\n \tstruct fdentry fd[MAX_FDS];\n-\tint num;\t\n+\tint num;\n };\n \n \ndiff --git a/lib/librte_vhost/vhost-user/vhost-net-user.c b/lib/librte_vhost/vhost-user/vhost-net-user.c\nindex 34450f4..0b100ba 100644\n--- a/lib/librte_vhost/vhost-user/vhost-net-user.c\n+++ b/lib/librte_vhost/vhost-user/vhost-net-user.c\n@@ -106,7 +106,7 @@ uds_socket(const char *path)\n \tret = listen(sockfd, 1);\n \tif (ret == -1)\n \t\tgoto err;\n-\t\n+\n \treturn sockfd;\n \n err:\n@@ -129,7 +129,7 @@ read_fd_message(int sockfd, char *buf, int buflen, int *fds, int fd_num)\n \n \tiov.iov_base = buf;\n \tiov.iov_len  = buflen;\n-\t\n+\n \tmsgh.msg_iov = &iov;\n \tmsgh.msg_iovlen = 1;\n \tmsgh.msg_control = control;\n@@ -148,7 +148,7 @@ read_fd_message(int sockfd, char *buf, int buflen, int *fds, int fd_num)\n \n \tfor (cmsg = CMSG_FIRSTHDR(&msgh); cmsg != NULL;\n \t\tcmsg = CMSG_NXTHDR(&msgh, cmsg)) {\n-\t\tif ( (cmsg->cmsg_level == SOL_SOCKET) && \n+\t\tif ( (cmsg->cmsg_level == SOL_SOCKET) &&\n \t\t\t(cmsg->cmsg_type == SCM_RIGHTS)) {\n \t\t\tmemcpy(fds, CMSG_DATA(cmsg), fdsize);\n \t\t\tbreak;\n@@ -162,14 +162,14 @@ read_vhost_message(int sockfd, struct VhostUserMsg *msg)\n {\n \tint ret;\n \n-\tret = read_fd_message(sockfd, (char *)msg, VHOST_USER_HDR_SIZE, \n+\tret = read_fd_message(sockfd, (char *)msg, VHOST_USER_HDR_SIZE,\n \t\tmsg->fds, VHOST_MEMORY_MAX_NREGIONS);\n \tif (ret <= 0)\n \t\treturn ret;\n \n \tif (msg->size) {\n \t\tif (msg->size > sizeof(msg->payload)) {\n-\t\t\tRTE_LOG(ERR, VHOST_CONFIG, \n+\t\t\tRTE_LOG(ERR, VHOST_CONFIG,\n \t\t\t\t\"%s: invalid size:%d\\n\", __func__, msg->size);\n \t\t\treturn -1;\n \t\t}\n@@ -182,7 +182,7 @@ read_vhost_message(int sockfd, struct VhostUserMsg *msg)\n \t\t}\n \t}\n \n-\treturn ret; \n+\treturn ret;\n }\n \n static int\n@@ -200,7 +200,7 @@ send_fd_message(int sockfd, char *buf, int buflen, int *fds, int fd_num)\n \tiov.iov_len = buflen;\n \tmsgh.msg_iov = &iov;\n \tmsgh.msg_iovlen = 1;\n-\t\n+\n \tif (fds && fd_num > 0) {\n \t\tmsgh.msg_control = control;\n \t\tmsgh.msg_controllen = sizeof(control);\n@@ -222,7 +222,7 @@ send_fd_message(int sockfd, char *buf, int buflen, int *fds, int fd_num)\n \t\tRTE_LOG(ERR, VHOST_CONFIG,  \"sendmsg error\\n\");\n \t\treturn -1;\n \t}\n-\t\n+\n \treturn 0;\n }\n \n@@ -233,15 +233,15 @@ send_vhost_message(int sockfd, struct VhostUserMsg *msg)\n \n \tmsg->flags &= ~VHOST_USER_VERSION_MASK;\n         msg->flags |= VHOST_USER_VERSION;\n-        msg->flags |= VHOST_USER_REPLY_MASK;\t\n+        msg->flags |= VHOST_USER_REPLY_MASK;\n \n-\tret = send_fd_message(sockfd, (char *)msg, \n+\tret = send_fd_message(sockfd, (char *)msg,\n \t\tVHOST_USER_HDR_SIZE + msg->size, NULL, 0);\n-\t\n+\n \treturn ret;\n }\n \n-/* call back when there is new connection.  */\n+/* call back when there is new connection. */\n static void\n vserver_new_vq_conn(int fd, uint64_t dat)\n {\n@@ -251,7 +251,7 @@ vserver_new_vq_conn(int fd, uint64_t dat)\n \tstruct vhost_device_ctx vdev_ctx = { 0 };\n \n \tconn_fd = accept(fd, NULL, NULL);\n-\tRTE_LOG(INFO, VHOST_CONFIG, \n+\tRTE_LOG(INFO, VHOST_CONFIG,\n \t\t\"%s: new connection is %d\\n\", __func__, conn_fd);\n \tif (conn_fd < 0)\n \t\treturn;\n@@ -259,8 +259,8 @@ vserver_new_vq_conn(int fd, uint64_t dat)\n \tfh = ops->new_device(vdev_ctx);\n \tRTE_LOG(INFO, VHOST_CONFIG, \"new device, handle is %d\\n\", fh);\n \n-\tfdset_add(&vserver->fdset, \n-\t\tconn_fd, vserver_message_handler, NULL, fh);\t\n+\tfdset_add(&vserver->fdset,\n+\t\tconn_fd, vserver_message_handler, NULL, fh);\n }\n \n /* callback when there is message on the connfd */\n@@ -277,7 +277,7 @@ vserver_message_handler(int connfd, uint64_t dat)\n \tret = read_vhost_message(connfd, &msg);\n \tif (ret < 0) {\n \t\tprintf(\"vhost read message failed\\n\");\n-\t\n+\n \t\t/*TODO: cleanup */\n \t\tclose(connfd);\n \t\tfdset_del(&g_vhost_server->fdset, connfd);\n@@ -286,7 +286,7 @@ vserver_message_handler(int connfd, uint64_t dat)\n \t\treturn;\n \t} else if (ret == 0) {\n \t\t/*TODO: cleanup */\n-\t\tRTE_LOG(INFO, VHOST_CONFIG, \n+\t\tRTE_LOG(INFO, VHOST_CONFIG,\n \t\t\t\"vhost peer closed\\n\");\n \t\tclose(connfd);\n \t\tfdset_del(&g_vhost_server->fdset, connfd);\n@@ -296,7 +296,7 @@ vserver_message_handler(int connfd, uint64_t dat)\n \t}\n \tif (msg.request > VHOST_USER_MAX) {\n \t\t/*TODO: cleanup */\n-\t\tRTE_LOG(INFO, VHOST_CONFIG, \n+\t\tRTE_LOG(INFO, VHOST_CONFIG,\n \t\t\t\"vhost read incorrect message\\n\");\n \t\tclose(connfd);\n \t\tfdset_del(&g_vhost_server->fdset, connfd);\n@@ -363,7 +363,6 @@ vserver_message_handler(int connfd, uint64_t dat)\n \n \tdefault:\n \t\tbreak;\n-\t\n \t}\n }\n \ndiff --git a/lib/librte_vhost/vhost-user/virtio-net-user.c b/lib/librte_vhost/vhost-user/virtio-net-user.c\nindex f38e6cc..4103977 100644\n--- a/lib/librte_vhost/vhost-user/virtio-net-user.c\n+++ b/lib/librte_vhost/vhost-user/virtio-net-user.c\n@@ -65,7 +65,7 @@ user_set_mem_table(struct vhost_device_ctx ctx, struct VhostUserMsg *pmsg)\n \t}\n \n \tfor (idx = 0; idx < memory.nregions;  idx++) {\n-\t\tuint64_t size = memory.regions[idx].userspace_addr - \n+\t\tuint64_t size = memory.regions[idx].userspace_addr -\n \t\t\tbase_address + memory.regions[idx].memory_size;\n \t\tif (mem_size < size)\n \t\t\tmem_size = size;\n@@ -75,28 +75,28 @@ user_set_mem_table(struct vhost_device_ctx ctx, struct VhostUserMsg *pmsg)\n \t * here we assume qemu will map only one file for memory allocation,\n \t * we only use fds[0] with offset 0.\n \t */\n-\tmapped_address = (uint64_t)(uintptr_t)mmap(NULL, mem_size, \n+\tmapped_address = (uint64_t)(uintptr_t)mmap(NULL, mem_size,\n \t\tPROT_READ | PROT_WRITE, MAP_SHARED, pmsg->fds[0], 0);\n \n \tif (mapped_address == (uint64_t)(uintptr_t)MAP_FAILED) {\n \t\tRTE_LOG(ERR, VHOST_CONFIG, \" mmap qemu guest failed.\\n\");\n \t\treturn -1;\n \t}\n-\t\t\t\n+\n \tfor (idx = 0; idx < memory.nregions; idx++) {\n-\t\tregions[idx].guest_phys_address = \n+\t\tregions[idx].guest_phys_address =\n \t\t\tmemory.regions[idx].guest_phys_addr;\n-\t\tregions[idx].guest_phys_address_end = \n+\t\tregions[idx].guest_phys_address_end =\n \t\t\tmemory.regions[idx].guest_phys_addr +\n \t\t\tmemory.regions[idx].memory_size;\n \t\tregions[idx].memory_size = memory.regions[idx].memory_size;\n-\t\tregions[idx].userspace_address = \n+\t\tregions[idx].userspace_address =\n \t\t\tmemory.regions[idx].userspace_addr;\n \n-\t\tregions[idx].address_offset = mapped_address - base_address + \n+\t\tregions[idx].address_offset = mapped_address - base_address +\n \t\t\tregions[idx].userspace_address -\n \t\t\tregions[idx].guest_phys_address;\n-\t\tLOG_DEBUG(VHOST_CONFIG, \n+\t\tLOG_DEBUG(VHOST_CONFIG,\n \t\t\t\"REGION: %u - GPA: %p - QEMU VA: %p - SIZE (%\"PRIu64\")\\n\",\n \t\t\tidx,\n \t\t\t(void *)(uintptr_t)regions[idx].guest_phys_address,\n@@ -129,28 +129,28 @@ user_set_mem_table(struct vhost_device_ctx ctx, struct VhostUserMsg *pmsg)\n \n \n \tfor (idx = 0; idx < memory.nregions; idx++) {\n-\t\tregions[idx].guest_phys_address = \n+\t\tregions[idx].guest_phys_address =\n \t\t\tmemory.regions[idx].guest_phys_addr;\n-\t\tregions[idx].guest_phys_address_end = \n+\t\tregions[idx].guest_phys_address_end =\n \t\t\tmemory.regions[idx].guest_phys_addr +\n \t\t\tmemory.regions[idx].memory_size;\n \t\tregions[idx].memory_size = memory.regions[idx].memory_size;\n-\t\tregions[idx].userspace_address = \n+\t\tregions[idx].userspace_address =\n \t\t\tmemory.regions[idx].userspace_addr;\n /*\n-\t\tmapped_address = (uint64_t)(uintptr_t)mmap(NULL, \n-\t\t\tregions[idx].memory_size, \n-\t\t\tPROT_READ | PROT_WRITE, MAP_SHARED, \n-\t\t\tpmsg->fds[idx], \n+\t\tmapped_address = (uint64_t)(uintptr_t)mmap(NULL,\n+\t\t\tregions[idx].memory_size,\n+\t\t\tPROT_READ | PROT_WRITE, MAP_SHARED,\n+\t\t\tpmsg->fds[idx],\n \t\t\tmemory.regions[idx].mmap_offset);\n */\n \n /* This is ugly */\n-\t\tmapped_address = (uint64_t)(uintptr_t)mmap(NULL, \n+\t\tmapped_address = (uint64_t)(uintptr_t)mmap(NULL,\n \t\t\tregions[idx].memory_size +\n-\t\t\t\tmemory.regions[idx].mmap_offset, \n-\t\t\tPROT_READ | PROT_WRITE, MAP_SHARED, \n-\t\t\tpmsg->fds[idx], \n+\t\t\t\tmemory.regions[idx].mmap_offset,\n+\t\t\tPROT_READ | PROT_WRITE, MAP_SHARED,\n+\t\t\tpmsg->fds[idx],\n \t\t\t0);\n \t\tprintf(\"mapped to %p\\n\", (void *)mapped_address);\n \n@@ -165,7 +165,7 @@ user_set_mem_table(struct vhost_device_ctx ctx, struct VhostUserMsg *pmsg)\n \n \t\tregions[idx].address_offset = mapped_address -\n \t\t\tregions[idx].guest_phys_address;\n-\t\tLOG_DEBUG(VHOST_CONFIG, \n+\t\tLOG_DEBUG(VHOST_CONFIG,\n \t\t\t\"REGION: %u - GPA: %p - QEMU VA: %p - SIZE (%\"PRIu64\")\\n\",\n \t\t\tidx,\n \t\t\t(void *)(uintptr_t)regions[idx].guest_phys_address,\n@@ -189,7 +189,7 @@ user_set_vring_call(struct vhost_device_ctx ctx, struct VhostUserMsg *pmsg)\n \n \tfile.index = pmsg->payload.u64 & VHOST_USER_VRING_IDX_MASK;\n \tfile.fd = pmsg->fds[0];\n-\tRTE_LOG(INFO, VHOST_CONFIG, \n+\tRTE_LOG(INFO, VHOST_CONFIG,\n \t\t\"vring call idx:%d file:%d\\n\", file.index, file.fd);\n \tops->set_vring_call(ctx, &file);\n }\n@@ -202,7 +202,7 @@ user_set_vring_kick(struct vhost_device_ctx ctx, struct VhostUserMsg *pmsg)\n \n \tfile.index = pmsg->payload.u64 & VHOST_USER_VRING_IDX_MASK;\n \tfile.fd = pmsg->fds[0];\n-\tRTE_LOG(INFO, VHOST_CONFIG, \n+\tRTE_LOG(INFO, VHOST_CONFIG,\n \t\t\"vring kick idx:%d file:%d\\n\", file.index, file.fd);\n \tops->set_vring_kick(ctx, &file);\n }\ndiff --git a/lib/librte_vhost/vhost_rxtx.c b/lib/librte_vhost/vhost_rxtx.c\nindex 8ff0301..3a33eb0 100644\n--- a/lib/librte_vhost/vhost_rxtx.c\n+++ b/lib/librte_vhost/vhost_rxtx.c\n@@ -217,7 +217,7 @@ rte_vhost_dequeue_burst(struct virtio_net *dev, uint16_t queue_id, struct rte_me\n \tif (vq->last_used_idx == avail_idx)\n \t\treturn 0;\n \n-\tLOG_DEBUG(VHOST_DATA, \"(%\"PRIu64\") %s(%d->%d)\\n\", \n+\tLOG_DEBUG(VHOST_DATA, \"(%\"PRIu64\") %s(%d->%d)\\n\",\n \t\tdev->device_fh, __func__, vq->last_used_idx, avail_idx);\n \n \t/* Prefetch available ring to retrieve head indexes. */\ndiff --git a/lib/librte_vhost/virtio-net.c b/lib/librte_vhost/virtio-net.c\nindex 516e743..30661e3 100644\n--- a/lib/librte_vhost/virtio-net.c\n+++ b/lib/librte_vhost/virtio-net.c\n@@ -82,7 +82,7 @@ qva_to_vva(struct virtio_net *dev, uint64_t qemu_va)\n \t\tif ((qemu_va >= region->userspace_address) &&\n \t\t\t(qemu_va <= region->userspace_address +\n \t\t\tregion->memory_size)) {\n-\t\t\tvhost_va = qemu_va +  region->guest_phys_address + \n+\t\t\tvhost_va = qemu_va + region->guest_phys_address +\n \t\t\t\tregion->address_offset -\n \t\t\t\tregion->userspace_address;\n \t\t\tbreak;\n@@ -476,7 +476,7 @@ set_mem_table(struct vhost_device_ctx ctx,\n \t\tif (mem->regions[regionidx].guest_phys_address == 0x0) {\n \t\t\tmem->base_address =\n \t\t\t\tmem->regions[regionidx].userspace_address;\n-\t\t\tmem->mapped_address = \n+\t\t\tmem->mapped_address =\n \t\t\t\tmem->regions[regionidx].address_offset;\n \t\t}\n \t}\n@@ -602,7 +602,7 @@ get_vring_base(struct vhost_device_ctx ctx, uint32_t index,\n \tstate->num = dev->virtqueue[state->index]->last_used_idx;\n \n \tif (dev->flags & VIRTIO_DEV_RUNNING) {\n-\t\tRTE_LOG(INFO, VHOST_CONFIG, \n+\t\tRTE_LOG(INFO, VHOST_CONFIG,\n \t\t\t\"get_vring_base message is for release\\n\");\n \t\tnotify_ops->destroy_device(dev);\n \t\t/*\n@@ -626,7 +626,7 @@ get_vring_base(struct vhost_device_ctx ctx, uint32_t index,\n \t\tclose((int)dev->virtqueue[VIRTIO_TXQ]->callfd);\n \tdev->virtqueue[VIRTIO_TXQ]->callfd = -1;\n \t/* We don't cleanup callfd here as we willn't get CALLFD again */\n-\t\n+\n \tdev->virtqueue[VIRTIO_RXQ]->desc = NULL;\n \tdev->virtqueue[VIRTIO_RXQ]->avail = NULL;\n \tdev->virtqueue[VIRTIO_RXQ]->used = NULL;\n@@ -650,7 +650,7 @@ virtio_is_ready(struct virtio_net *dev, int index)\n \t/* mq support in future.*/\n \tvq1 = dev->virtqueue[index];\n \tvq2 = dev->virtqueue[index ^ 1];\n-\tif (vq1 && vq2 && vq1->desc && vq2->desc && \n+\tif (vq1 && vq2 && vq1->desc && vq2->desc &&\n \t\t(vq1->kickfd > 0) && (vq1->callfd > 0) &&\n \t\t(vq2->kickfd > 0) && (vq2->callfd > 0)) {\n \t\tLOG_DEBUG(VHOST_CONFIG, \"virtio is ready for processing.\\n\");\n",
    "prefixes": [
        "dpdk-dev",
        "RFC"
    ]
}