[PATCH v6 08/19] xen/cpufreq: rename cppc preset name to "XEN_SYSCTL_CPPC_SET_PRESET_ONDEMAND"

[Penny Zheng <Penny.Zheng@xxxxxxx>]

"ondemand" is more suitable to describe a preset in which epp value is set
with medium(CPPC_ENERGY_PERF_BALANCE), showing no preference over performance or
powersave, minimum with lowest and maximum with highest.

Signed-off-by: Penny Zheng <Penny.Zheng@xxxxxxx>
---
v5 -> v6:
- new commit
---
 tools/misc/xenpm.c              | 4 ++--
 xen/arch/x86/acpi/cpufreq/hwp.c | 2 +-
 xen/include/public/sysctl.h     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c
index bbe45fa548..55b0b0c482 100644
--- a/tools/misc/xenpm.c
+++ b/tools/misc/xenpm.c
@@ -1445,9 +1445,9 @@ static int parse_cppc_opts(xc_set_cppc_para_t *set_cppc, 
int *cpuid,
         set_cppc->set_params = XEN_SYSCTL_CPPC_SET_PRESET_PERFORMANCE;
         i++;
     }
-    else if ( strcasecmp(argv[i], "balance") == 0 )
+    else if ( strcasecmp(argv[i], "ondemand") == 0 )
     {
-        set_cppc->set_params = XEN_SYSCTL_CPPC_SET_PRESET_BALANCE;
+        set_cppc->set_params = XEN_SYSCTL_CPPC_SET_PRESET_ONDEMAND;
         i++;
     }
 
diff --git a/xen/arch/x86/acpi/cpufreq/hwp.c b/xen/arch/x86/acpi/cpufreq/hwp.c
index 7bf475ecb5..cec2ee262e 100644
--- a/xen/arch/x86/acpi/cpufreq/hwp.c
+++ b/xen/arch/x86/acpi/cpufreq/hwp.c
@@ -610,7 +610,7 @@ int set_hwp_para(struct cpufreq_policy *policy,
         data->desired = 0;
         break;
 
-    case XEN_SYSCTL_CPPC_SET_PRESET_BALANCE:
+    case XEN_SYSCTL_CPPC_SET_PRESET_ONDEMAND:
         data->minimum = data->hw.lowest;
         data->maximum = data->hw.highest;
         data->activity_window = 0;
diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h
index 86b6df30e7..aafa7fcf2b 100644
--- a/xen/include/public/sysctl.h
+++ b/xen/include/public/sysctl.h
@@ -430,7 +430,7 @@ struct xen_set_cppc_para {
 #define XEN_SYSCTL_CPPC_SET_ACT_WINDOW           (1U << 4)
 #define XEN_SYSCTL_CPPC_SET_PRESET_MASK          0xf0000000U
 #define XEN_SYSCTL_CPPC_SET_PRESET_NONE          0x00000000U
-#define XEN_SYSCTL_CPPC_SET_PRESET_BALANCE       0x10000000U
+#define XEN_SYSCTL_CPPC_SET_PRESET_ONDEMAND      0x10000000U
 #define XEN_SYSCTL_CPPC_SET_PRESET_POWERSAVE     0x20000000U
 #define XEN_SYSCTL_CPPC_SET_PRESET_PERFORMANCE   0x30000000U
 #define XEN_SYSCTL_CPPC_SET_PARAM_MASK \
-- 
2.34.1