ia64/xen-unstable

changeset 18468:b5912430e66c

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>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Sep 10 10:51:48 2008 +0100 (2008-09-10)
parents 65dc37be0443
children 6a37b3d966f9
files tools/examples/xmexample.hvm tools/examples/xmexample.hvm-stubdom tools/python/xen/xm/create.py
line diff
     1.1 --- a/tools/examples/xmexample.hvm	Wed Sep 10 10:47:46 2008 +0100
     1.2 +++ b/tools/examples/xmexample.hvm	Wed Sep 10 10:51:48 2008 +0100
     1.3 @@ -220,7 +220,7 @@ serial='pty'
     1.4  #   Configure guest CPUID responses:
     1.5  #
     1.6  #cpuid=[ '1:ecx=xxxxxxxxxxx00xxxxxxxxxxxxxxxxxxx,
     1.7 -#           eax=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' ]
     1.8 +#           eax=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' ]
     1.9  # - Unset the SSE4 features (CPUID.1[ECX][20-19])
    1.10  # - Default behaviour for all other bits in ECX And EAX registers.
    1.11  # 
     2.1 --- a/tools/examples/xmexample.hvm-stubdom	Wed Sep 10 10:47:46 2008 +0100
     2.2 +++ b/tools/examples/xmexample.hvm-stubdom	Wed Sep 10 10:51:48 2008 +0100
     2.3 @@ -236,7 +236,7 @@ stdvga=0
     2.4  #   Configure guest CPUID responses:
     2.5  #
     2.6  #cpuid=[ '1:ecx=xxxxxxxxxxx00xxxxxxxxxxxxxxxxxxx,
     2.7 -#           eax=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' ]
     2.8 +#           eax=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' ]
     2.9  # - Unset the SSE4 features (CPUID.1[ECX][20-19])
    2.10  # - Default behaviour for all other bits in ECX And EAX registers.
    2.11  # 
     3.1 --- a/tools/python/xen/xm/create.py	Wed Sep 10 10:47:46 2008 +0100
     3.2 +++ b/tools/python/xen/xm/create.py	Wed Sep 10 10:51:48 2008 +0100
     3.3 @@ -566,11 +566,11 @@ gopts.var('hap', val='HAP',
     3.4            use="""Hap status (0=hap is disabled;
     3.5            1=hap is enabled.""")
     3.6  
     3.7 -gopts.var('cpuid', val="IN[,SIN]:eax=EAX,ebx=EBX,exc=ECX,edx=EDX",
     3.8 +gopts.var('cpuid', val="IN[,SIN]:eax=EAX,ebx=EBX,ecx=ECX,edx=EDX",
     3.9            fn=append_value, default=[],
    3.10            use="""Cpuid description.""")
    3.11  
    3.12 -gopts.var('cpuid_check', val="IN[,SIN]:eax=EAX,ebx=EBX,exc=ECX,edx=EDX",
    3.13 +gopts.var('cpuid_check', val="IN[,SIN]:eax=EAX,ebx=EBX,ecx=ECX,edx=EDX",
    3.14            fn=append_value, default=[],
    3.15            use="""Cpuid check description.""")
    3.16  
    3.17 @@ -971,7 +971,7 @@ def preprocess_cpuid(vals, attr_name):
    3.18                          "of the register %s for input %s\n"
    3.19                          % (res['reg'], input) )
    3.20                  cpuid[input][res['reg']] = res['val'] # new register
    3.21 -    setattr(vals, attr_name, cpuid)
    3.22 +            setattr(vals, attr_name, cpuid)
    3.23  
    3.24  def preprocess_pci(vals):
    3.25      if not vals.pci: return