[Xen-changelog] [xen-unstable] amd: fix CPUID mask option handling

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1224082640 -3600
# Node ID 33d6ed9fd3c552bc368c448c804562424a0322e0
# Parent  3603e95245fab2bb5e331c411ed67205ce0248ac
amd: fix CPUID mask option handling

c/s 18402 added command line options to AMD-specific code duplicating
ones already existing in Intel code. The generic command line parser
didn't support this scenario for integer options, however.

Additionally, the options added were using the same option string for
two different purposes.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 xen/arch/x86/cpu/amd.c |    4 ++--
 xen/common/kernel.c    |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff -r 3603e95245fa -r 33d6ed9fd3c5 xen/arch/x86/cpu/amd.c
--- a/xen/arch/x86/cpu/amd.c    Wed Oct 15 15:56:26 2008 +0100
+++ b/xen/arch/x86/cpu/amd.c    Wed Oct 15 15:57:20 2008 +0100
@@ -37,8 +37,8 @@ integer_param("cpuid_mask_ecx", opt_cpui
 integer_param("cpuid_mask_ecx", opt_cpuid_mask_ecx);
 integer_param("cpuid_mask_edx", opt_cpuid_mask_edx);
 static unsigned int opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx;
-integer_param("cpuid_mask_ecx", opt_cpuid_mask_ext_ecx);
-integer_param("cpuid_mask_edx", opt_cpuid_mask_ext_edx);
+integer_param("cpuid_mask_ext_ecx", opt_cpuid_mask_ext_ecx);
+integer_param("cpuid_mask_ext_edx", opt_cpuid_mask_ext_edx);
 
 static inline void wrmsr_amd(unsigned int index, unsigned int lo, 
                unsigned int hi)
diff -r 3603e95245fa -r 33d6ed9fd3c5 xen/common/kernel.c
--- a/xen/common/kernel.c       Wed Oct 15 15:56:26 2008 +0100
+++ b/xen/common/kernel.c       Wed Oct 15 15:57:20 2008 +0100
@@ -75,8 +75,7 @@ void cmdline_parse(char *cmdline)
                 strlcpy(param->var, optval, param->len);
                 break;
             case OPT_UINT:
-                *(unsigned int *)param->var =
-                    simple_strtol(optval, (const char **)&optval, 0);
+                *(unsigned int *)param->var = simple_strtol(optval, NULL, 0);
                 break;
             case OPT_BOOL:
             case OPT_INVBOOL:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog