xen/del_usb_xend_entry.patch
Charles Arnold 8be17801c5 - Update to changeset 21087 Xen 4.0.0 RC9.
- Update to changeset 21075 Xen 4.0.0 RC8. 

- bnc#584210 - xm usb-hc-destroy does not remove entry from xend
  del_usb_xend_entry.patch

- Update to changeset 21057 Xen 4.0.0 RC7.

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=37
2010-04-02 15:57:59 +00:00

23 lines
1.4 KiB
Diff

Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
--- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -1306,8 +1306,15 @@ class XendDomainInfo:
frontpath = self.getDeviceController(deviceClass).frontendPath(dev)
backpath = xstransact.Read(frontpath, "backend")
thread.start_new_thread(self.getDeviceController(deviceClass).finishDeviceCleanup, (backpath, path))
-
- rc = self.getDeviceController(deviceClass).destroyDevice(devid, force)
+ if deviceClass =='vusb':
+ dev = self.getDeviceController(deviceClass).convertToDeviceNumber(devid)
+ state = self.getDeviceController(deviceClass).readBackend(dev, 'state')
+ if state == '1':
+ rc = self.getDeviceController(deviceClass).destroyDevice(devid, True)
+ else:
+ rc = self.getDeviceController(deviceClass).destroyDevice(devid, force)
+ else:
+ rc = self.getDeviceController(deviceClass).destroyDevice(devid, force)
if not force and rm_cfg:
# The backend path, other than the device itself,
# has to be passed because its accompanied frontend