net/virtio: fix incorrect cast of void *

[dpdk.git] / examples / multi_process / client_server_mp / mp_server / init.c

diff --git a/examples/multi_process/client_server_mp/mp_server/init.c b/examples/multi_process/client_server_mp/mp_server/init.c
index 908c8dd..c8d0211 100644 (file)
--- a/examples/multi_process/client_server_mp/mp_server/init.c
+++ b/examples/multi_process/client_server_mp/mp_server/init.c
@@ -42,7 +42,6 @@
 #include <rte_common.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_byteorder.h>
 #include <rte_atomic.h>
@@ -57,25 +56,19 @@
 #include <rte_memcpy.h>
 #include <rte_mbuf.h>
 #include <rte_interrupts.h>
-#include <rte_pci.h>
 #include <rte_ether.h>
 #include <rte_ethdev.h>
 #include <rte_malloc.h>
-#include <rte_fbk_hash.h>
 #include <rte_string_fns.h>
 #include <rte_cycles.h>
 
 #include "common.h"
 #include "args.h"
 #include "init.h"
-#include "main.h"
 
 #define MBUFS_PER_CLIENT 1536
 #define MBUFS_PER_PORT 1536
 #define MBUF_CACHE_SIZE 512
-#define MBUF_OVERHEAD (sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
-#define RX_MBUF_DATA_SIZE 2048
-#define MBUF_SIZE (RX_MBUF_DATA_SIZE + MBUF_OVERHEAD)
 
 #define RTE_MP_RX_DESC_DEFAULT 512
 #define RTE_MP_TX_DESC_DEFAULT 512
@@ -106,12 +99,10 @@ init_mbuf_pools(void)
         * seems faster to use a cache instead */
        printf("Creating mbuf pool '%s' [%u mbufs] ...\n",
                        PKTMBUF_POOL_NAME, num_mbufs);
-       pktmbuf_pool = rte_mempool_create(PKTMBUF_POOL_NAME, num_mbufs,
-                       MBUF_SIZE, MBUF_CACHE_SIZE,
-                       sizeof(struct rte_pktmbuf_pool_private), rte_pktmbuf_pool_init,
-                       NULL, rte_pktmbuf_init, NULL, rte_socket_id(), NO_FLAGS );
+       pktmbuf_pool = rte_pktmbuf_pool_create(PKTMBUF_POOL_NAME, num_mbufs,
+               MBUF_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
 
-       return (pktmbuf_pool == NULL); /* 0  on success */
+       return pktmbuf_pool == NULL; /* 0  on success */
 }
 
 /**
@@ -122,7 +113,7 @@ init_mbuf_pools(void)
  * - start the port and report its status to stdout
  */
 static int
-init_port(uint8_t port_num)
+init_port(uint16_t port_num)
 {
        /* for port configuration all features are off by default */
        const struct rte_eth_conf port_conf = {
@@ -131,13 +122,13 @@ init_port(uint8_t port_num)
                }
        };
        const uint16_t rx_rings = 1, tx_rings = num_clients;
-       const uint16_t rx_ring_size = RTE_MP_RX_DESC_DEFAULT;
-       const uint16_t tx_ring_size = RTE_MP_TX_DESC_DEFAULT;
+       uint16_t rx_ring_size = RTE_MP_RX_DESC_DEFAULT;
+       uint16_t tx_ring_size = RTE_MP_TX_DESC_DEFAULT;
 
        uint16_t q;
        int retval;
 
-       printf("Port %u init ... ", (unsigned)port_num);
+       printf("Port %u init ... ", port_num);
        fflush(stdout);
 
        /* Standard DPDK port initialisation - config port, then set up
@@ -146,6 +137,11 @@ init_port(uint8_t port_num)
                &port_conf)) != 0)
                return retval;
 
+       retval = rte_eth_dev_adjust_nb_rx_tx_desc(port_num, &rx_ring_size,
+                       &tx_ring_size);
+       if (retval != 0)
+               return retval;
+
        for (q = 0; q < rx_rings; q++) {
                retval = rte_eth_rx_queue_setup(port_num, q, rx_ring_size,
                                rte_eth_dev_socket_id(port_num),
@@ -203,11 +199,12 @@ init_shm_rings(void)
 
 /* Check the link status of all ports in up to 9s, and print them finally */
 static void
-check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
+check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
 {
 #define CHECK_INTERVAL 100 /* 100ms */
 #define MAX_CHECK_TIME 90 /* 9s (90 * 100ms) in total */
-       uint8_t portid, count, all_ports_up, print_flag = 0;
+       uint16_t portid;
+       uint8_t count, all_ports_up, print_flag = 0;
        struct rte_eth_link link;
 
        printf("\nChecking link status");
@@ -233,7 +230,7 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
                                continue;
                        }
                        /* clear all_ports_up flag if any link down */
-                       if (link.link_status == 0) {
+                       if (link.link_status == ETH_LINK_DOWN) {
                                all_ports_up = 0;
                                break;
                        }
@@ -265,7 +262,7 @@ init(int argc, char *argv[])
 {
        int retval;
        const struct rte_memzone *mz;
-       uint8_t i, total_ports;
+       uint16_t i, total_ports;
 
        /* init EAL, parsing EAL args */
        retval = rte_eal_init(argc, argv);