[Xen-changelog] [xen-unstable] x86, xend: Fix processing of cpuid config parameters

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1221040308 -3600
# Node ID b5912430e66c900c2092c035227816f43f7caeb0
# Parent  65dc37be0443e856d53e3a1f0c9f8f4a8999b851
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@xxxxxxxxxx>
---
 tools/examples/xmexample.hvm         |    2 +-
 tools/examples/xmexample.hvm-stubdom |    2 +-
 tools/python/xen/xm/create.py        |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff -r 65dc37be0443 -r b5912430e66c tools/examples/xmexample.hvm
--- a/tools/examples/xmexample.hvm      Wed Sep 10 10:47:46 2008 +0100
+++ b/tools/examples/xmexample.hvm      Wed Sep 10 10:51:48 2008 +0100
@@ -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 -r 65dc37be0443 -r b5912430e66c tools/examples/xmexample.hvm-stubdom
--- a/tools/examples/xmexample.hvm-stubdom      Wed Sep 10 10:47:46 2008 +0100
+++ b/tools/examples/xmexample.hvm-stubdom      Wed Sep 10 10:51:48 2008 +0100
@@ -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 -r 65dc37be0443 -r b5912430e66c tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py     Wed Sep 10 10:47:46 2008 +0100
+++ b/tools/python/xen/xm/create.py     Wed Sep 10 10:51:48 2008 +0100
@@ -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

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