x86, xend: Fix processing of cpuid config parameters

There is an python indentation issue keeping the full range of syntax
for the cpuid config file parameter from working correctly.  This
patch fixes that.  It also fixes some misspelling and a missing 'x' in
two of the example config files (must have 32 bits represented for
cpuid registers).

Signed-off-by: Bruce Rogers <brogers@novell.com>

diff --git a/tools/examples/xmexample.hvm b/tools/examples/xmexample.hvm
index 63df01797480e175aff1bdd4a0d9ba89657b7161..3df007fd810b932c7e023d20d02c9a57173a1725 100644 (file)
--- a/tools/examples/xmexample.hvm
+++ b/tools/examples/xmexample.hvm
@@ -220,7 +220,7 @@ serial='pty'
 #   Configure guest CPUID responses:
 #
 #cpuid=[ '1:ecx=xxxxxxxxxxx00xxxxxxxxxxxxxxxxxxx,
-#           eax=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' ]
+#           eax=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' ]
 # - Unset the SSE4 features (CPUID.1[ECX][20-19])
 # - Default behaviour for all other bits in ECX And EAX registers.
 # 

diff --git a/tools/examples/xmexample.hvm-stubdom b/tools/examples/xmexample.hvm-stubdom
index 94d6c1b1038f93e46bd4b56e8dd67b35dfcfcb02..bfceef30f3b1712df06a5110d9109643470c80b5 100644 (file)
--- a/tools/examples/xmexample.hvm-stubdom
+++ b/tools/examples/xmexample.hvm-stubdom
@@ -236,7 +236,7 @@ stdvga=0
 #   Configure guest CPUID responses:
 #
 #cpuid=[ '1:ecx=xxxxxxxxxxx00xxxxxxxxxxxxxxxxxxx,
-#           eax=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' ]
+#           eax=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' ]
 # - Unset the SSE4 features (CPUID.1[ECX][20-19])
 # - Default behaviour for all other bits in ECX And EAX registers.
 # 

diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py
index a4bf35071e777adc48d524724df0e18bf3f38727..f5637dd60e410432fc861f5eac33abe88aba3f60 100644 (file)
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@ -566,11 +566,11 @@ gopts.var('hap', val='HAP',
           use="""Hap status (0=hap is disabled;
           1=hap is enabled.""")
 
-gopts.var('cpuid', val="IN[,SIN]:eax=EAX,ebx=EBX,exc=ECX,edx=EDX",
+gopts.var('cpuid', val="IN[,SIN]:eax=EAX,ebx=EBX,ecx=ECX,edx=EDX",
           fn=append_value, default=[],
           use="""Cpuid description.""")
 
-gopts.var('cpuid_check', val="IN[,SIN]:eax=EAX,ebx=EBX,exc=ECX,edx=EDX",
+gopts.var('cpuid_check', val="IN[,SIN]:eax=EAX,ebx=EBX,ecx=ECX,edx=EDX",
           fn=append_value, default=[],
           use="""Cpuid check description.""")
 
@@ -971,7 +971,7 @@ def preprocess_cpuid(vals, attr_name):
                         "of the register %s for input %s\n"
                         % (res['reg'], input) )
                 cpuid[input][res['reg']] = res['val'] # new register
-    setattr(vals, attr_name, cpuid)
+            setattr(vals, attr_name, cpuid)
 
 def preprocess_pci(vals):
     if not vals.pci: return