examples/ip_pipeline: move config files to separate directory

[dpdk.git] / examples / vm_power_manager / channel_manager.c

diff --git a/examples/vm_power_manager/channel_manager.c b/examples/vm_power_manager/channel_manager.c
index 9968ed9..7d892e2 100644 (file)
--- a/examples/vm_power_manager/channel_manager.c
+++ b/examples/vm_power_manager/channel_manager.c
@@ -389,7 +389,7 @@ add_all_channels(const char *vm_name)
                errno = 0;
                channel_num = (unsigned)strtol(remaining, &tail_ptr, 0);
                if ((errno != 0) || (remaining[0] == '\0') ||
-                               (*tail_ptr != '\0') || tail_ptr == NULL) {
+                               tail_ptr == NULL || (*tail_ptr != '\0')) {
                        RTE_LOG(WARNING, CHANNEL_MANAGER, "Malformed channel name"
                                        "'%s' found it should be in the form of "
                                        "'<guest_name>.<channel_num>(decimal)'\n",
@@ -408,7 +408,7 @@ add_all_channels(const char *vm_name)
                        continue;
 
                chan_info = rte_malloc(NULL, sizeof(*chan_info),
-                               CACHE_LINE_SIZE);
+                               RTE_CACHE_LINE_SIZE);
                if (chan_info == NULL) {
                        RTE_LOG(ERR, CHANNEL_MANAGER, "Error allocating memory for "
                                "channel '%s%s'\n", CHANNEL_MGR_SOCKET_PATH, dir->d_name);
@@ -476,7 +476,7 @@ add_channels(const char *vm_name, unsigned *channel_list,
                        continue;
                }
                chan_info = rte_malloc(NULL, sizeof(*chan_info),
-                               CACHE_LINE_SIZE);
+                               RTE_CACHE_LINE_SIZE);
                if (chan_info == NULL) {
                        RTE_LOG(ERR, CHANNEL_MANAGER, "Error allocating memory for "
                                        "channel '%s'\n", socket_path);
@@ -597,7 +597,7 @@ get_info_vm(const char *vm_name, struct vm_info *info)
        ITERATIVE_BITMASK_CHECK_64(mask, i) {
                info->channels[channel_num].channel_num = i;
                memcpy(info->channels[channel_num].channel_path,
-                               vm_info->channels[i]->channel_path, PATH_MAX);
+                               vm_info->channels[i]->channel_path, UNIX_PATH_MAX);
                info->channels[channel_num].status = vm_info->channels[i]->status;
                info->channels[channel_num].fd = vm_info->channels[i]->fd;
                channel_num++;
@@ -639,7 +639,7 @@ add_vm(const char *vm_name)
        }
 
        new_domain = rte_malloc("virtual_machine_info", sizeof(*new_domain),
-                       CACHE_LINE_SIZE);
+                       RTE_CACHE_LINE_SIZE);
        if (new_domain == NULL) {
                RTE_LOG(ERR, CHANNEL_MANAGER, "Unable to allocate memory for VM "
                                "info\n");
@@ -745,13 +745,13 @@ channel_manager_init(const char *path)
        global_maplen = VIR_CPU_MAPLEN(CHANNEL_CMDS_MAX_CPUS);
 
        global_vircpuinfo = rte_zmalloc(NULL, sizeof(*global_vircpuinfo) *
-                       CHANNEL_CMDS_MAX_CPUS, CACHE_LINE_SIZE);
+                       CHANNEL_CMDS_MAX_CPUS, RTE_CACHE_LINE_SIZE);
        if (global_vircpuinfo == NULL) {
                RTE_LOG(ERR, CHANNEL_MANAGER, "Error allocating memory for CPU Info\n");
                goto error;
        }
        global_cpumaps = rte_zmalloc(NULL, CHANNEL_CMDS_MAX_CPUS * global_maplen,
-                       CACHE_LINE_SIZE);
+                       RTE_CACHE_LINE_SIZE);
        if (global_cpumaps == NULL) {
                goto error;
        }
@@ -800,9 +800,7 @@ channel_manager_exit(void)
                rte_free(vm_info);
        }
 
-       if (global_cpumaps != NULL)
-               rte_free(global_cpumaps);
-       if (global_vircpuinfo != NULL)
-               rte_free(global_vircpuinfo);
+       rte_free(global_cpumaps);
+       rte_free(global_vircpuinfo);
        disconnect_hypervisor();
 }