ia64/xen-unstable

changeset 18442:392b04ccaf3c

xsm: A few hacks to get XSM-disabled (aka dummy) mode working.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Sep 04 16:29:38 2008 +0100 (2008-09-04)
parents ae9b223a675d
children 1a785d213573
files tools/python/xen/util/xsconstants.py tools/python/xen/util/xsm/dummy/dummy.py
line diff
     1.1 --- a/tools/python/xen/util/xsconstants.py	Thu Sep 04 14:38:26 2008 +0100
     1.2 +++ b/tools/python/xen/util/xsconstants.py	Thu Sep 04 16:29:38 2008 +0100
     1.3 @@ -20,9 +20,9 @@ XS_INST_NONE = 0
     1.4  XS_INST_BOOT = (1 << 0)
     1.5  XS_INST_LOAD = (1 << 1)
     1.6  
     1.7 -XS_POLICY_DUMMY  = 0
     1.8  XS_POLICY_ACM = (1 << 0)
     1.9  XS_POLICY_FLASK = (1 << 1)
    1.10 +XS_POLICY_DUMMY  = (1 << 2)
    1.11  XS_POLICY_USE = 0
    1.12  
    1.13  # Some internal variables used by the Xen-API
    1.14 @@ -109,6 +109,6 @@ ACM_POLICY_ID = 'ACM'
    1.15  
    1.16  INVALID_POLICY_PREFIX = 'INV_'
    1.17  
    1.18 -INVALID_SSIDREF = 0xFFFFFFFF
    1.19 +INVALID_SSIDREF = 0xFFFFFFFFL
    1.20  
    1.21  XS_INACCESSIBLE_LABEL = '__INACCESSIBLE__'
     2.1 --- a/tools/python/xen/util/xsm/dummy/dummy.py	Thu Sep 04 14:38:26 2008 +0100
     2.2 +++ b/tools/python/xen/util/xsm/dummy/dummy.py	Thu Sep 04 16:29:38 2008 +0100
     2.3 @@ -36,7 +36,7 @@ def err(msg):
     2.4      raise XSMError(msg)
     2.5  
     2.6  def on():
     2.7 -    return xsconstants.XS_POLICY_DUMMY
     2.8 +    return 0
     2.9  
    2.10  def ssidref2label(ssidref):
    2.11      return 0