800917b5a2
- Update to Xen 4.1.2_rc2 c/s 23152 - bnc#716695 - domUs using tap devices will not start updated multi-xvdp.patch - Upstream patches from Jan 23803-intel-pmu-models.patch 23800-x86_64-guest-addr-range.patch 23795-intel-ich10-quirk.patch 23804-x86-IPI-counts.patch - bnc#706106 - Inconsistent reporting of VM names during migration xend-migration-domname-fix.patch - bnc#712823 - L3:Xen guest does not start reliable when rebooted xend-vcpu-affinity-fix.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=143
23 lines
1.4 KiB
Diff
23 lines
1.4 KiB
Diff
Index: xen-4.1.2-testing/tools/python/xen/xend/XendDomainInfo.py
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
|
|
+++ xen-4.1.2-testing/tools/python/xen/xend/XendDomainInfo.py
|
|
@@ -1296,8 +1296,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
|