From: Pramod Devendra <pramod.deven...@citrix.com> Signed-off-by: Pramod Devendra <pramod.deven...@citrix.com> CC: Ian Jackson <ian.jack...@eu.citrix.com> CC: Stefano Stabellini <stefano.stabell...@eu.citrix.com> CC: Ian Campbell <ian.campb...@citrix.com> CC: Wei Liu <wei.l...@citrix.com> --- tools/libxl/libxl_cpuid.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c index b0bdc9d..c66e912 100644 --- a/tools/libxl/libxl_cpuid.c +++ b/tools/libxl/libxl_cpuid.c @@ -223,9 +223,6 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) } entry = cpuid_find_match(cpuid, flag->leaf, flag->subleaf); resstr = entry->policy[flag->reg - 1]; - if (resstr == NULL) { - resstr = strdup("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); - } num = strtoull(val, &endptr, 0); flags[flag->length] = 0; if (endptr != val) { @@ -242,6 +239,11 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) return 3; } } + + if (resstr == NULL) { + resstr = strdup("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + } + /* the family and model entry is potentially split up across * two fields in Fn0000_0001_EAX, so handle them here separately. */ -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel