Imported Upstream version 16.07-rc2

[deb_dpdk.git] / lib / librte_eal / linuxapp / eal / eal_vfio_mp_sync.c

diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c b/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c
similarity index 97%
rename from lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c
rename to lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c
index d54ded8..00cf919 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio_mp_sync.c
+++ b/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c
@@ -265,7 +265,7 @@ vfio_mp_sync_connect_to_primary(void)
  * socket listening thread for primary process
  */
 static __attribute__((noreturn)) void *
-pci_vfio_mp_sync_thread(void __rte_unused * arg)
+vfio_mp_sync_thread(void __rte_unused * arg)
 {
        int ret, fd, vfio_group_no;
 
@@ -296,7 +296,7 @@ pci_vfio_mp_sync_thread(void __rte_unused * arg)
 
                switch (ret) {
                case SOCKET_REQ_CONTAINER:
-                       fd = pci_vfio_get_container_fd();
+                       fd = vfio_get_container_fd();
                        if (fd < 0)
                                vfio_mp_sync_send_request(conn_sock, SOCKET_ERR);
                        else
@@ -310,7 +310,7 @@ pci_vfio_mp_sync_thread(void __rte_unused * arg)
                                continue;
                        }
 
-                       fd = pci_vfio_get_group_fd(vfio_group_no);
+                       fd = vfio_get_group_fd(vfio_group_no);
 
                        if (fd < 0)
                                vfio_mp_sync_send_request(conn_sock, SOCKET_ERR);
@@ -376,7 +376,7 @@ vfio_mp_sync_socket_setup(void)
  * set up a local socket and tell it to listen for incoming connections
  */
 int
-pci_vfio_mp_sync_setup(void)
+vfio_mp_sync_setup(void)
 {
        int ret;
        char thread_name[RTE_MAX_THREAD_NAME_LEN];
@@ -387,7 +387,7 @@ pci_vfio_mp_sync_setup(void)
        }
 
        ret = pthread_create(&socket_thread, NULL,
-                       pci_vfio_mp_sync_thread, NULL);
+                       vfio_mp_sync_thread, NULL);
        if (ret) {
                RTE_LOG(ERR, EAL,
                        "Failed to create thread for communication with secondary processes!\n");
@@ -396,7 +396,7 @@ pci_vfio_mp_sync_setup(void)
        }
 
        /* Set thread_name for aid in debugging. */
-       snprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, "pci-vfio-sync");
+       snprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, "vfio-sync");
        ret = rte_thread_setname(socket_thread, thread_name);
        if (ret)
                RTE_LOG(DEBUG, EAL,