Revert c/s 19250, as it seems to be causing problems.

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

diff --git a/tools/hotplug/Linux/xen-hotplug-cleanup b/tools/hotplug/Linux/xen-hotplug-cleanup
index b0798ee1480b52a0b0ab78e8b657cb807e3e7214..f7337e45bfa0c52d6fcddd8eeead4dd222bcf9f1 100644 (file)
--- a/tools/hotplug/Linux/xen-hotplug-cleanup
+++ b/tools/hotplug/Linux/xen-hotplug-cleanup
@@ -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 \
 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 --git a/tools/python/xen/xend/server/DevController.py b/tools/python/xen/xend/server/DevController.py
index 6c2bb09ca638419681591e3c7b1ebdb9a58a802c..67ca78ff797f7b2b0a9fc67baeb175534893cf0a 100644 (file)
--- a/tools/python/xen/xend/server/DevController.py
+++ b/tools/python/xen/xend/server/DevController.py
@@ -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))