diff options
author | Dario Faggioli <dario.faggioli@citrix.com> | 2013-04-17 10:57:28 +0000 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2013-04-17 12:11:14 +0100 |
commit | 15299b5bb3e01759b05f59fc2aebbade46dc35cf (patch) | |
tree | 3d174c4cebaf4ee8538cf9a3b5b7a90e3a5b4375 /xen/include/public | |
parent | 65a11256f294882d6bd1af4af51e42dbbead650d (diff) | |
download | xen-15299b5bb3e01759b05f59fc2aebbade46dc35cf.tar.gz xen-15299b5bb3e01759b05f59fc2aebbade46dc35cf.tar.bz2 xen-15299b5bb3e01759b05f59fc2aebbade46dc35cf.zip |
xen, libxc: rename xenctl_cpumap to xenctl_bitmap
More specifically:
1. replaces xenctl_cpumap with xenctl_bitmap
2. provides bitmap_to_xenctl_bitmap and the reverse;
3. re-implement cpumask_to_xenctl_bitmap with
bitmap_to_xenctl_bitmap and the reverse;
Other than #3, no functional changes. Interface only slightly
afected.
This is in preparation of introducing NUMA node-affinity maps.
Signed-off-by: Dario Faggioli <dario.faggioli@citrix.com>
Acked-by: George Dunlap <george.dunlap@eu.citrix.com>
Acked-by: Juergen Gross <juergen.gross@ts.fujitsu.com>
Acked-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/include/public')
-rw-r--r-- | xen/include/public/arch-x86/xen-mca.h | 2 | ||||
-rw-r--r-- | xen/include/public/domctl.h | 2 | ||||
-rw-r--r-- | xen/include/public/sysctl.h | 4 | ||||
-rw-r--r-- | xen/include/public/xen.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/xen/include/public/arch-x86/xen-mca.h b/xen/include/public/arch-x86/xen-mca.h index dca6b3e8ff..04382edeee 100644 --- a/xen/include/public/arch-x86/xen-mca.h +++ b/xen/include/public/arch-x86/xen-mca.h @@ -414,7 +414,7 @@ struct xen_mc_mceinject { struct xen_mc_inject_v2 { uint32_t flags; - struct xenctl_cpumap cpumap; + struct xenctl_bitmap cpumap; }; #endif diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 113b8dc498..9f5ed48a0e 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -285,7 +285,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_getvcpuinfo_t); /* XEN_DOMCTL_getvcpuaffinity */ struct xen_domctl_vcpuaffinity { uint32_t vcpu; /* IN */ - struct xenctl_cpumap cpumap; /* IN/OUT */ + struct xenctl_bitmap cpumap; /* IN/OUT */ }; typedef struct xen_domctl_vcpuaffinity xen_domctl_vcpuaffinity_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vcpuaffinity_t); diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 3ca51beb95..03710d896f 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -71,7 +71,7 @@ struct xen_sysctl_tbuf_op { #define XEN_SYSCTL_TBUFOP_disable 5 uint32_t cmd; /* IN/OUT variables */ - struct xenctl_cpumap cpu_mask; + struct xenctl_bitmap cpu_mask; uint32_t evt_mask; /* OUT variables */ uint64_aligned_t buffer_mfn; @@ -532,7 +532,7 @@ struct xen_sysctl_cpupool_op { uint32_t domid; /* IN: M */ uint32_t cpu; /* IN: AR */ uint32_t n_dom; /* OUT: I */ - struct xenctl_cpumap cpumap; /* OUT: IF */ + struct xenctl_bitmap cpumap; /* OUT: IF */ }; typedef struct xen_sysctl_cpupool_op xen_sysctl_cpupool_op_t; DEFINE_XEN_GUEST_HANDLE(xen_sysctl_cpupool_op_t); diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index 4dd9615b9b..3cab74f18e 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -869,9 +869,9 @@ __DEFINE_XEN_GUEST_HANDLE(uint64, uint64_t); #endif #ifndef __ASSEMBLY__ -struct xenctl_cpumap { +struct xenctl_bitmap { XEN_GUEST_HANDLE_64(uint8) bitmap; - uint32_t nr_cpus; + uint32_t nr_bits; }; #endif |