xsm: A few hacks to get XSM-disabled (aka dummy) mode working.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

tools/python/xen/util/xsconstants.py

@@ -20,9 +20,9 @@ XS_INST_NONE = 0
 XS_INST_BOOT = (1 << 0)
 XS_INST_LOAD = (1 << 1)
 
-XS_POLICY_DUMMY  = 0
 XS_POLICY_ACM = (1 << 0)
 XS_POLICY_FLASK = (1 << 1)
+XS_POLICY_DUMMY  = (1 << 2)
 XS_POLICY_USE = 0
 
 # Some internal variables used by the Xen-API
@@ -109,6 +109,6 @@ ACM_POLICY_ID = 'ACM'
 
 INVALID_POLICY_PREFIX = 'INV_'
 
-INVALID_SSIDREF = 0xFFFFFFFF
+INVALID_SSIDREF = 0xFFFFFFFFL
 
 XS_INACCESSIBLE_LABEL = '__INACCESSIBLE__'

tools/python/xen/util/xsm/dummy/dummy.py

@@ -36,7 +36,7 @@ def err(msg):
     raise XSMError(msg)
 
 def on():
-    return xsconstants.XS_POLICY_DUMMY
+    return 0
 
 def ssidref2label(ssidref):
     return 0