|
|
|
|
|
|
|
|
|
|
xen-changelog
[Xen-changelog] [xen-unstable] Revert c/s 19250, as it seems to be causi
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1236846750 0
# Node ID 131c799580cb07b43518b81c9e0872ac5a88c9c8
# Parent 5b8f9ef92e00fe5070f5470fc1e3e32b9e85efd5
Revert c/s 19250, as it seems to be causing problems.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
tools/hotplug/Linux/xen-hotplug-cleanup | 10 ----------
tools/python/xen/xend/server/DevController.py | 4 ++--
2 files changed, 2 insertions(+), 12 deletions(-)
diff -r 5b8f9ef92e00 -r 131c799580cb tools/hotplug/Linux/xen-hotplug-cleanup
--- a/tools/hotplug/Linux/xen-hotplug-cleanup Wed Mar 11 19:13:47 2009 +0000
+++ b/tools/hotplug/Linux/xen-hotplug-cleanup Thu Mar 12 08:32:30 2009 +0000
@@ -11,13 +11,6 @@ dir=$(dirname "$0")
# This is pretty horrible, but there's not really a nicer way of solving this.
claim_lock "block"
-# split backend/DEVCLASS/VMID/DEVID on slashes
-path_array=( ${XENBUS_PATH//\// } )
-# get /vm/UUID path
-vm=$(xenstore-read "/local/domain/${path_array[2]}/vm")
-# construct /vm/UUID/device/DEVCLASS/DEVID
-vm_dev="$vm/device/${path_array[1]}/${path_array[3]}"
-
# remove device frontend store entries
xenstore-rm -t \
$(xenstore-read "$XENBUS_PATH/frontend" 2>/dev/null) 2>/dev/null || true
@@ -26,7 +19,4 @@ xenstore-rm -t "$XENBUS_PATH" 2>/
xenstore-rm -t "$XENBUS_PATH" 2>/dev/null || true
xenstore-rm -t "error/$XENBUS_PATH" 2>/dev/null || true
-# remove device path from /vm/UUID
-xenstore-rm -t "$vm_dev" 2>/dev/null || true
-
release_lock "block"
diff -r 5b8f9ef92e00 -r 131c799580cb
tools/python/xen/xend/server/DevController.py
--- a/tools/python/xen/xend/server/DevController.py Wed Mar 11 19:13:47
2009 +0000
+++ b/tools/python/xen/xend/server/DevController.py Thu Mar 12 08:32:30
2009 +0000
@@ -235,8 +235,8 @@ class DevController:
xstransact.Remove(backpath)
xstransact.Remove(frontpath)
- # xstransact.Remove(self.devicePath()) ?? Below is the same ?
- self.vm._removeVm("device/%s/%d" % (self.deviceClass, dev))
+ # xstransact.Remove(self.devicePath()) ?? Below is the same ?
+ self.vm._removeVm("device/%s/%d" % (self.deviceClass, dev))
def configurations(self, transaction = None):
return map(lambda x: self.configuration(x, transaction),
self.deviceIDs(transaction))
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
<Prev in Thread] |
Current Thread |
[Next in Thread> |
- [Xen-changelog] [xen-unstable] Revert c/s 19250, as it seems to be causing problems.,
Xen patchbot-unstable <=
|
|
|
|
|