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

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

diff --git a/tools/python/xen/util/xsconstants.py b/tools/python/xen/util/xsconstants.py
index 29540f0278ade255994472b90dca23b36a28a10a..58739ebdbf7588afcc0fa9f6a0ad8393f668d6f1 100644 (file)
--- a/tools/python/xen/util/xsconstants.py
+++ b/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__'

diff --git a/tools/python/xen/util/xsm/dummy/dummy.py b/tools/python/xen/util/xsm/dummy/dummy.py
index 5748699ee7455a8187be92bb644d1ff4c3bc676e..b82e1b9ff5d1655de7f619c4aa45c95f02904992 100644 (file)
--- a/tools/python/xen/util/xsm/dummy/dummy.py
+++ b/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