--- xen/xend/XendOptions.py	2008-01-18 18:31:10.000000000 +0100
+++ xen/xend/XendOptions.py	2008-04-27 00:47:22.000000000 +0200
@@ -126,6 +126,12 @@
     """Default script to configure a backend network interface"""
     vif_script = osdep.vif_script
 
+    """Default behaviour regarding locking"""
+    default_cluster_locking = 'no'
+
+    """Default directory to use for locking in cluster mode"""
+    default_cluster_locking_dir = '/xen_cluster/lock'
+
     def __init__(self):
         self.configure()
 
@@ -314,6 +320,13 @@
     def get_vnc_x509_verify(self):
         return self.get_config_string('vnc-x509-verify', self.xend_vnc_x509_verify)
 
+    # Cluster locking stuff
+    def get_cluster_locking(self):
+        return self.get_config_string('cluster-locking', self.default_cluster_locking)
+
+    def get_cluster_locking_dir(self):
+        return self.get_config_string('cluster-locking-dir', self.default_cluster_locking_dir)
+
 
 class XendOptionsFile(XendOptions):