libxl: introduce cpuid interface to domain build
PATCH 1/5 libxl: introduce cpuid interface to domain build
Add a cpuid parameter into libxl_domain_build_info and use it's content while setting up the domain. This is a only paving the way, the real functionality is implemented in the later patches.
Signature · 3 lines
Andre Przywara AMD-Operating System Research Center (OSRC), Dresden, Germany Tel: +49 351 448-3567-12
Quoted 1 line
From
8045ab8f2e25c5c755d884f30da18ece1a4cf44fMon Sep 17 00:00:00 2001
From: Andre Przywara <[email protected]>
Date: Tue, 24 Aug 2010 09:35:51 +0200
Subject: [PATCH 1/5] xl: introduce cpuid interface to domain build
this one adds a cpuid parameter into libxl_domain_build_info and uses it's content while setting up the domain. This is a placeholder for now, since the parsing is only implemented in the next patch.
--- tools/libxl/libxl.c | 15 +++++++++++++++ tools/libxl/libxl.h | 8 ++++++++ tools/libxl/libxl.idl | 2 ++ tools/libxl/libxl_dom.c | 6 ++++++ tools/libxl/libxl_internal.h | 11 +++++++++++ tools/libxl/xl_cmdimpl.c | 1 + 6 files changed, 43 insertions(+), 0 deletions(-)
tools/libxl/libxl.c +15 -0
@@ -102,6 +102,21 @@ void libxl_key_value_list_destroy(libxl_key_value_list *pkvl)free (kvl); } +void libxl_cpuid_destroy (libxl_cpuid_policy_list *p_cpuid_list) +{ +int i, j; +libxl_cpuid_policy_list cpuid_list = *p_cpuid_list; + +if (cpuid_list ==NULL ) +return ; +for (i =0 ; cpuid_list[i].input[0 ] !=XEN_CPUID_INPUT_UNUSED ; i++) { +for (j =0 ; j <4 ; j++) +if (cpuid_list[i].policy[j] !=NULL ) +free (cpuid_list[i].policy[j]); + } +return ; +} +/******************************************************************************/ int libxl_domain_make(libxl_ctx *ctx, libxl_domain_create_info *info,
tools/libxl/libxl.h +8 -0
@@ -172,6 +172,13 @@ typedef enum {NICTYPE_VIF , } libxl_nic_type; +/* libxl_cpuid_policy_list is a dynamic array storing CPUID policies +* for multiple leafs. It is terminated with an entry holding +* XEN_CPUID_INPUT_UNUSED in input[0] +*/ +typedef struct libxl__cpuid_policy libxl_cpuid_policy ; +typedef libxl_cpuid_policy *libxl_cpuid_policy_list ; +#define LIBXL_PCI_FUNC_ALL (~0U)#include "_libxl_types.h"
@@ -231,6 +238,7 @@ int libxl_domain_preserve(libxl_ctx *ctx, uint32_t domid, libxl_domain_create_invoid libxl_string_list_destroy (libxl_string_list *sl);void libxl_key_value_list_destroy (libxl_key_value_list *kvl);void libxl_file_reference_destroy (libxl_file_reference *f); +void libxl_cpuid_destroy (libxl_cpuid_policy_list *cpuid_list);/* * Run the configured bootloader for a PV domain and update
tools/libxl/libxl.idl +2 -0
@@ -11,6 +11,7 @@ libxl_console_consback = Builtin("console_consback") libxl_console_constype = Builtin("console_constype") libxl_disk_phystype = Builtin("disk_phystype") libxl_nic_type = Builtin("nic_type") +libxl_cpuid_policy_list = Builtin("cpuid_policy_list", destructor_fn="libxl_cpuid_destroy", passby=PASS_BY_REFERENCE) libxl_string_list = Builtin("string_list", destructor_fn="libxl_string_list_destroy", passby=PASS_BY_REFERENCE) libxl_key_value_list = Builtin("key_value_list", destructor_fn="libxl_key_value_list_destroy", passby=PASS_BY_REFERENCE)
@@ -97,6 +98,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("shadow_memkb", uint32), ("disable_migrate", bool), ("kernel", libxl_file_reference), + ("cpuid", libxl_cpuid_policy_list), ("hvm", integer), ("u", KeyedUnion(None, "hvm", [("hvm", "%s", Struct(None,
tools/libxl/libxl_dom.c +6 -0
@@ -95,9 +95,15 @@ 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 ents =libxl__calloc (&gc,12 + (info->max_vcpus *2 ) +2 ,sizeof (char *));
tools/libxl/libxl_internal.h +11 -0
@@ -235,6 +235,17 @@ _hidden char *libxl__abs_path(libxl__gc *gc, char *s, const char *path); _hidden char *libxl__domid_to_name(libxl__gc *gc, uint32_t domid); _hidden char *libxl__poolid_to_name(libxl__gc *gc, uint32_t poolid); + +/* holds the CPUID response for a single CPUID leaf +* input contains the value of the EAX and ECX register, +* and each policy string contains a filter to apply to +* the host given values for that particular leaf. +*/ +struct libxl__cpuid_policy { +uint32_t input[2 ]; +char *policy[4 ]; +}; +/* * blktap2 support */
tools/libxl/xl_cmdimpl.c +1 -0
@@ -271,6 +271,7 @@ static void init_build_info(libxl_domain_build_info *b_info, libxl_domain_create b_info->max_memkb =32 *1024 ; b_info->target_memkb = b_info->max_memkb; b_info->disable_migrate =0 ; + b_info->cpuid =NULL ;if (c_info->hvm) { b_info->shadow_memkb =0 ;/* Set later */ b_info->video_memkb =8 *1024 ;
Signature · 1 line
1.6.4
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Quoted 5 lines · Andre Przywara
Add a cpuid parameter into
libxl_domain_build_infoand use it's content while setting up the domain. This is a only paving the way, the real functionality is implemented in the later patches.Signed-off-by Andre Przywara <[email protected]>
Looks good to me, thanks!