domctl/sysctl: Clean up definitions

 - Use fixed-width types only
 - Use named unions only
 - Bump domctl version number

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

1 files changed, 15 insertions, 15 deletions

diff --git a/tools/libxc/xc_pm.c b/tools/libxc/xc_pm.c
index 501041073e..bb9a80c9e2 100644
--- a/tools/libxc/xc_pm.c
+++ b/tools/libxc/xc_pm.c
@@ -184,7 +184,7 @@ int xc_get_cpufreq_para(int xc_handle, int cpuid,
 {
     DECLARE_SYSCTL;
     int ret = 0;
-    struct xen_get_cpufreq_para *sys_para = &sysctl.u.pm_op.get_para;
+    struct xen_get_cpufreq_para *sys_para = &sysctl.u.pm_op.u.get_para;
     bool has_num = user_para->cpu_num &&
                      user_para->freq_num &&
                      user_para->gov_num;
@@ -276,7 +276,7 @@ unlock_1:
 int xc_set_cpufreq_gov(int xc_handle, int cpuid, char *govname)
 {
     DECLARE_SYSCTL;
-    char *scaling_governor = sysctl.u.pm_op.set_gov.scaling_governor;
+    char *scaling_governor = sysctl.u.pm_op.u.set_gov.scaling_governor;
 
     if ( (xc_handle < 0) || (!govname) )
         return -EINVAL;
@@ -301,8 +301,8 @@ int xc_set_cpufreq_para(int xc_handle, int cpuid,
     sysctl.cmd = XEN_SYSCTL_pm_op;
     sysctl.u.pm_op.cmd = SET_CPUFREQ_PARA;
     sysctl.u.pm_op.cpuid = cpuid;
-    sysctl.u.pm_op.set_para.ctrl_type = ctrl_type;
-    sysctl.u.pm_op.set_para.ctrl_value = ctrl_value;
+    sysctl.u.pm_op.u.set_para.ctrl_type = ctrl_type;
+    sysctl.u.pm_op.u.set_para.ctrl_value = ctrl_value;
 
     return xc_sysctl(xc_handle, &sysctl);
 }
@@ -320,7 +320,7 @@ int xc_get_cpufreq_avgfreq(int xc_handle, int cpuid, int *avg_freq)
     sysctl.u.pm_op.cpuid = cpuid;
     ret = xc_sysctl(xc_handle, &sysctl);
 
-    *avg_freq = sysctl.u.pm_op.get_avgfreq;
+    *avg_freq = sysctl.u.pm_op.u.get_avgfreq;
 
     return ret;
 }
@@ -333,14 +333,14 @@ int xc_get_cputopo(int xc_handle, struct xc_get_cputopo *info)
     sysctl.cmd = XEN_SYSCTL_pm_op;
     sysctl.u.pm_op.cmd = XEN_SYSCTL_pm_op_get_cputopo;
     sysctl.u.pm_op.cpuid = 0;
-    set_xen_guest_handle( sysctl.u.pm_op.get_topo.cpu_to_core,
+    set_xen_guest_handle( sysctl.u.pm_op.u.get_topo.cpu_to_core,
                          info->cpu_to_core );
-    set_xen_guest_handle( sysctl.u.pm_op.get_topo.cpu_to_socket,
+    set_xen_guest_handle( sysctl.u.pm_op.u.get_topo.cpu_to_socket,
                          info->cpu_to_socket );
-    sysctl.u.pm_op.get_topo.max_cpus = info->max_cpus;
+    sysctl.u.pm_op.u.get_topo.max_cpus = info->max_cpus;
 
     rc = do_sysctl(xc_handle, &sysctl);
-    info->nr_cpus = sysctl.u.pm_op.get_topo.nr_cpus;
+    info->nr_cpus = sysctl.u.pm_op.u.get_topo.nr_cpus;
 
     return rc;
 }
@@ -356,7 +356,7 @@ int xc_set_sched_opt_smt(int xc_handle, uint32_t value)
    sysctl.cmd = XEN_SYSCTL_pm_op;
    sysctl.u.pm_op.cmd = XEN_SYSCTL_pm_op_set_sched_opt_smt;
    sysctl.u.pm_op.cpuid = 0;
-   sysctl.u.pm_op.set_sched_opt_smt = value;
+   sysctl.u.pm_op.u.set_sched_opt_smt = value;
    rc = do_sysctl(xc_handle, &sysctl);
 
    return rc;
@@ -370,7 +370,7 @@ int xc_set_vcpu_migration_delay(int xc_handle, uint32_t value)
    sysctl.cmd = XEN_SYSCTL_pm_op;
    sysctl.u.pm_op.cmd = XEN_SYSCTL_pm_op_set_vcpu_migration_delay;
    sysctl.u.pm_op.cpuid = 0;
-   sysctl.u.pm_op.set_vcpu_migration_delay = value;
+   sysctl.u.pm_op.u.set_vcpu_migration_delay = value;
    rc = do_sysctl(xc_handle, &sysctl);
 
    return rc;
@@ -387,7 +387,7 @@ int xc_get_vcpu_migration_delay(int xc_handle, uint32_t *value)
    rc = do_sysctl(xc_handle, &sysctl);
 
    if (!rc && value)
-       *value = sysctl.u.pm_op.get_vcpu_migration_delay;
+       *value = sysctl.u.pm_op.u.get_vcpu_migration_delay;
 
    return rc;
 }
@@ -403,9 +403,9 @@ int xc_get_cpuidle_max_cstate(int xc_handle, uint32_t *value)
     sysctl.cmd = XEN_SYSCTL_pm_op;
     sysctl.u.pm_op.cmd = XEN_SYSCTL_pm_op_get_max_cstate;
     sysctl.u.pm_op.cpuid = 0;
-    sysctl.u.pm_op.get_max_cstate = 0;
+    sysctl.u.pm_op.u.get_max_cstate = 0;
     rc = do_sysctl(xc_handle, &sysctl);
-    *value = sysctl.u.pm_op.get_max_cstate;
+    *value = sysctl.u.pm_op.u.get_max_cstate;
 
     return rc;
 }
@@ -420,7 +420,7 @@ int xc_set_cpuidle_max_cstate(int xc_handle, uint32_t value)
     sysctl.cmd = XEN_SYSCTL_pm_op;
     sysctl.u.pm_op.cmd = XEN_SYSCTL_pm_op_set_max_cstate;
     sysctl.u.pm_op.cpuid = 0;
-    sysctl.u.pm_op.set_max_cstate = value;
+    sysctl.u.pm_op.u.set_max_cstate = value;
 
     return do_sysctl(xc_handle, &sysctl);
 }