diff options
author | KUWAMURA Shin'ya <kuwa@jp.fujitsu.com> | 2010-11-09 17:43:12 +0000 |
---|---|---|
committer | KUWAMURA Shin'ya <kuwa@jp.fujitsu.com> | 2010-11-09 17:43:12 +0000 |
commit | e737da7402197195b997c778d9dab2995f49b6ab (patch) | |
tree | 5e27b3539550306f73c77951e90babe255abe22e /tools/libxl/libxl_dom.c | |
parent | 4831e2743f6f8d42ebba883dbf541d7963268bca (diff) | |
download | xen-e737da7402197195b997c778d9dab2995f49b6ab.tar.gz xen-e737da7402197195b997c778d9dab2995f49b6ab.tar.bz2 xen-e737da7402197195b997c778d9dab2995f49b6ab.zip |
tools: libxl: fix cpuid compilation errors for ia64
ia64 does not have cpuid. So break out cpuid-related functions into a
separate file, with stubs for ia64.
Signed-off-by: KUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/libxl/libxl_dom.c')
-rw-r--r-- | tools/libxl/libxl_dom.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 6329942db5..819a6bb63d 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -96,16 +96,10 @@ int libxl__build_post(libxl_ctx *ctx, uint32_t domid, xs_transaction_t t; char **ents; int i; - char *cpuid_res[4]; -#if defined(__i386__) || defined(__x86_64__) - xc_cpuid_apply_policy(ctx->xch, domid); - if (info->cpuid != NULL) { - for (i = 0; info->cpuid[i].input[0] != XEN_CPUID_INPUT_UNUSED; i++) - xc_cpuid_set(ctx->xch, domid, info->cpuid[i].input, - (const char**)(info->cpuid[i].policy), cpuid_res); - } -#endif + libxl_cpuid_apply_policy(ctx, domid); + if (info->cpuid != NULL) + libxl_cpuid_set(ctx, domid, info->cpuid); ents = libxl__calloc(&gc, 12 + (info->max_vcpus * 2) + 2, sizeof(char *)); ents[0] = "memory/static-max"; |