[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] Remove "Died" support from the hotplug monitoring. This error code was used
# HG changeset patch # User emellor@xxxxxxxxxxxxxxxxxxxxxx # Node ID 4aeb3950114533b09317a3ea056a66dbb5899050 # Parent f3d2e36597864b7a716544e42e2aec436bed494f Remove "Died" support from the hotplug monitoring. This error code was used when hotplugStatusCallback raised VmError, but this can no longer happen. Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx> diff -r f3d2e3659786 -r 4aeb39501145 tools/python/xen/xend/server/DevController.py --- a/tools/python/xen/xend/server/DevController.py Tue Jan 3 16:26:24 2006 +++ b/tools/python/xen/xend/server/DevController.py Tue Jan 3 16:28:00 2006 @@ -32,11 +32,10 @@ HOTPLUG_STATUS_BUSY = "busy" Connected = 1 -Died = 2 -Error = 3 -Missing = 4 -Timeout = 5 -Busy = 6 +Error = 2 +Missing = 3 +Timeout = 4 +Busy = 5 xenbusState = { 'Unknown' : 0, @@ -157,11 +156,6 @@ raise VmError("Device %s (%s) could not be connected. " "Device not found." % (devid, self.deviceClass)) - elif status == Died: - self.destroyDevice(devid) - raise VmError("Device %s (%s) could not be connected. " - "Device has died." % (devid, self.deviceClass)) - elif status == Busy: err = None frontpath = self.frontendPath(devid) @@ -408,20 +402,17 @@ def hotplugStatusCallback(statusPath, ev, result): log.debug("hotplugStatusCallback %s.", statusPath) - try: - status = xstransact.Read(statusPath) - - if status is not None: - if status == HOTPLUG_STATUS_ERROR: - result['status'] = Error - elif status == HOTPLUG_STATUS_BUSY: - result['status'] = Busy - else: - result['status'] = Connected - else: - return 1 - except VmError: - result['status'] = Died + status = xstransact.Read(statusPath) + + if status is not None: + if status == HOTPLUG_STATUS_ERROR: + result['status'] = Error + elif status == HOTPLUG_STATUS_BUSY: + result['status'] = Busy + else: + result['status'] = Connected + else: + return 1 log.debug("hotplugStatusCallback %d.", result['status']) _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |