examples/vm_power_manager: fix build

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

diff --git a/examples/vm_power_manager/power_manager.c b/examples/vm_power_manager/power_manager.c
index 21dc3a7..7b4f4b3 100644 (file)
--- a/examples/vm_power_manager/power_manager.c
+++ b/examples/vm_power_manager/power_manager.c
@@ -39,7 +39,7 @@ struct freq_info {
        unsigned num_freqs;
 } __rte_cache_aligned;
 
-static struct freq_info global_core_freq_info[POWER_MGR_MAX_CPUS];
+static struct freq_info global_core_freq_info[RTE_MAX_LCORE];
 
 struct core_info ci;
 
@@ -62,14 +62,13 @@ core_info_init(void)
        ci->core_count = get_nprocs_conf();
        ci->branch_ratio_threshold = BRANCH_RATIO_THRESHOLD;
        ci->cd = malloc(ci->core_count * sizeof(struct core_details));
+       memset(ci->cd, 0, ci->core_count * sizeof(struct core_details));
        if (!ci->cd) {
                RTE_LOG(ERR, POWER_MANAGER, "Failed to allocate memory for core info.");
                return -1;
        }
        for (i = 0; i < ci->core_count; i++) {
                ci->cd[i].global_enabled_cpus = 1;
-               ci->cd[i].oob_enabled = 0;
-               ci->cd[i].msr_fd = 0;
        }
        printf("%d cores in system\n", ci->core_count);
        return 0;
@@ -83,7 +82,7 @@ power_manager_init(void)
        struct core_info *ci;
        unsigned int max_core_num;
 
-       rte_power_set_env(PM_ENV_ACPI_CPUFREQ);
+       rte_power_set_env(PM_ENV_NOT_SET);
 
        ci = get_core_info();
        if (!ci) {
@@ -92,8 +91,8 @@ power_manager_init(void)
                return -1;
        }
 
-       if (ci->core_count > POWER_MGR_MAX_CPUS)
-               max_core_num = POWER_MGR_MAX_CPUS;
+       if (ci->core_count > RTE_MAX_LCORE)
+               max_core_num = RTE_MAX_LCORE;
        else
                max_core_num = ci->core_count;
 
@@ -132,9 +131,9 @@ power_manager_get_current_frequency(unsigned core_num)
 {
        uint32_t freq, index;
 
-       if (core_num >= POWER_MGR_MAX_CPUS) {
+       if (core_num >= RTE_MAX_LCORE) {
                RTE_LOG(ERR, POWER_MANAGER, "Core(%u) is out of range 0...%d\n",
-                               core_num, POWER_MGR_MAX_CPUS-1);
+                               core_num, RTE_MAX_LCORE-1);
                return -1;
        }
        if (!(ci.cd[core_num].global_enabled_cpus))
@@ -143,7 +142,7 @@ power_manager_get_current_frequency(unsigned core_num)
        rte_spinlock_lock(&global_core_freq_info[core_num].power_sl);
        index = rte_power_get_freq(core_num);
        rte_spinlock_unlock(&global_core_freq_info[core_num].power_sl);
-       if (index >= POWER_MGR_MAX_CPUS)
+       if (index >= RTE_MAX_LCORE_FREQS)
                freq = 0;
        else
                freq = global_core_freq_info[core_num].freqs[index];
@@ -166,8 +165,8 @@ power_manager_exit(void)
                return -1;
        }
 
-       if (ci->core_count > POWER_MGR_MAX_CPUS)
-               max_core_num = POWER_MGR_MAX_CPUS;
+       if (ci->core_count > RTE_MAX_LCORE)
+               max_core_num = RTE_MAX_LCORE;
        else
                max_core_num = ci->core_count;
 
@@ -246,7 +245,7 @@ power_manager_scale_core_med(unsigned int core_num)
        struct core_info *ci;
 
        ci = get_core_info();
-       if (core_num >= POWER_MGR_MAX_CPUS)
+       if (core_num >= RTE_MAX_LCORE)
                return -1;
        if (!(ci->cd[core_num].global_enabled_cpus))
                return -1;