diff options
author | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-09-14 19:53:29 +0000 |
---|---|---|
committer | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-09-14 19:53:29 +0000 |
commit | 28a6a6b4c58aa23e8efd3a54b4e90b02ff1d91eb (patch) | |
tree | a12f7e167fd19d6f7332f7591e535e11ff5e4bd7 | |
parent | eae219de6f25fcafa57445d6d763d127ced4abf7 (diff) | |
download | xen-28a6a6b4c58aa23e8efd3a54b4e90b02ff1d91eb.tar.gz xen-28a6a6b4c58aa23e8efd3a54b4e90b02ff1d91eb.tar.bz2 xen-28a6a6b4c58aa23e8efd3a54b4e90b02ff1d91eb.zip |
Switch most uses of write over to store.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
-rw-r--r-- | tools/python/xen/xend/XendDomain.py | 1 | ||||
-rw-r--r-- | tools/python/xen/xend/XendDomainInfo.py | 34 |
2 files changed, 11 insertions, 24 deletions
diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py index 795a572761..010f9df080 100644 --- a/tools/python/xen/xend/XendDomain.py +++ b/tools/python/xen/xend/XendDomain.py @@ -136,7 +136,6 @@ class XendDomain: try: domid = int(domdb["domid"].getData()) except: - log.info("fuck off") domid = None # XXX if domid in self.domains, then something went wrong if (domid is None) or (domid in self.domains): diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 0df0097f60..05edb93be2 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -263,7 +263,7 @@ class XendDomainInfo: self.device_model_pid = 0 self.writeVm("uuid", self.uuid) - self.writeDom("vm", self.path) + self.storeDom("vm", self.path) def readVm(self, *args): return xstransact.Read(self.path, *args) @@ -316,47 +316,35 @@ class XendDomainInfo: @param dom: domain id """ self.domid = domid - self.writeDom("domid", "%i" % self.domid) + self.storeDom("domid", self.domid) def getDomain(self): return self.domid def setName(self, name): self.name = name - self.writeVm("name", name) + self.storeVm("name", name) def getName(self): return self.name def setStoreRef(self, ref): self.store_mfn = ref - if ref: - self.writeDom("store/ring-ref", "%i" % ref) - else: - self.removeDom("store/ring-ref") + self.storeDom("store/ring-ref", ref) def setStoreChannel(self, channel): if self.store_channel and self.store_channel != channel: self.store_channel.close() self.store_channel = channel - if channel: - self.writeDom("store/port", "%i" % channel.port1) - else: - self.removeDom("store/port") + self.storeDom("store/port", channel.port1) def setConsoleRef(self, ref): self.console_mfn = ref - if ref: - self.writeDom("console/ring-ref", "%i" % ref) - else: - self.removeDom("console/ring-ref") + self.storeDom("console/ring-ref", ref) def setMemoryTarget(self, target): self.memory_target = target - if target: - self.writeDom("memory/target", "%i" % target) - else: - self.removeDom("memory/target") + self.storeDom("memory/target", target) def update(self, info=None): """Update with info from xc.domain_getinfo(). @@ -835,7 +823,7 @@ class XendDomainInfo: # if anything goes wrong, assume the port was not yet set pass ret = EventChannel.interdomain(0, self.domid, port1=port, port2=0) - self.writeDom(path, "%i" % ret.port1) + self.storeDom(path, ret.port1) return ret def create_channel(self): @@ -1082,12 +1070,12 @@ class XendDomainInfo: availability = "offline" else: availability = "online" - self.writeVm("cpu/%d/availability" % vcpu, availability) + self.storeVm("cpu/%d/availability" % vcpu, availability) def shutdown(self, reason): if not reason in shutdown_reasons.values(): raise XendError('invalid reason:' + reason) - self.writeVm("control/shutdown", reason) + self.storeVm("control/shutdown", reason) if not reason in ['suspend']: self.shutdown_pending = {'start':time.time(), 'reason':reason} @@ -1095,7 +1083,7 @@ class XendDomainInfo: self.removeVm("control/shutdown") def send_sysrq(self, key=0): - self.writeVm("control/sysrq", '%c' % key) + self.storeVm("control/sysrq", '%c' % key) def shutdown_time_left(self, timeout): if not self.shutdown_pending: |