From: Andrew Cooper Date: Wed, 29 Mar 2023 11:37:33 +0000 (+0100) Subject: x86: Merge xc_cpu_policy's cpuid and msr objects X-Git-Tag: RELEASE-4.14.6~41 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cfcf8333505bc5591a9b512cee52f55cbf2b1719;p=xen.git x86: Merge xc_cpu_policy's cpuid and msr objects Right now, they're the same underlying type, containing disjoint information. Use a single object instead. Also take the opportunity to rename 'entries' to 'msrs' which is more descriptive, and more in line with nr_msrs being the count of MSR entries in the API. test-tsx uses xg_private.h to access the internals of xc_cpu_policy, so needs updating at the same time. Take the opportunity to improve the code clarity by passing a cpu_policy rather than an xc_cpu_policy into some functions. No practical change. This undoes the transient doubling of storage space from earlier patches. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit c9985233ca663fea20fc8807cf509d2e3fef0dca) --- diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index 08e8772417..539b0d2bde 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -434,7 +434,7 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, bool restore, xc_dominfo_t di; unsigned int i, nr_leaves, nr_msrs; xen_cpuid_leaf_t *leaves = NULL; - struct cpuid_policy *p = NULL; + struct cpu_policy *p = NULL; uint32_t err_leaf = -1, err_subleaf = -1, err_msr = -1; uint32_t host_featureset[FEATURESET_NR_ENTRIES] = {}; uint32_t len = ARRAY_SIZE(host_featureset);