8f6e1e085f
- pass -j N to stubdom build - add xenalzye from http://xenbits.xensource.com/ext/xenalyze.hg - hotplug-block-losetup-a.patch allow hardlinked blockdevices - fate#310510 - fix xenpaging xenpaging.paging_prep_enomem.patch - retry page-in if guest is temporary out-of-memory xenpaging.print-arguments.patch - print arguments passed to xenpaging xenpaging.machine_to_phys_mapping.patch - invalidate array during page deallocation xenpaging.autostart_delay.patch - fold xenpaging.enabled.patch into this patch - set xenpaging_delay to 0.0 to start xenpaging right away - blktap2 patch - fix problem that blktap2 device info not cleared when block-attach fail. blktap2.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=88
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
Calling function doesn't handle an "Exception" but only VmError, thus cleanup work won't been done if using Exception.
|
|
Change it to VmError.
|
|
|
|
Signed-off-by ChunyanLiu <cyliu@novell.com>
|
|
|
|
Index: xen-4.0.1-testing/tools/python/xen/xend/server/BlktapController.py
|
|
===================================================================
|
|
--- xen-4.0.1-testing.orig/tools/python/xen/xend/server/BlktapController.py
|
|
+++ xen-4.0.1-testing/tools/python/xen/xend/server/BlktapController.py
|
|
@@ -4,6 +4,7 @@ import string, re
|
|
from xen.xend.server.blkif import BlkifController
|
|
from xen.xend.XendLogging import log
|
|
from xen.util.xpopen import xPopen3
|
|
+from xen.xend.XendError import VmError
|
|
|
|
phantomDev = 0;
|
|
phantomId = 0;
|
|
@@ -209,7 +210,7 @@ class Blktap2Controller(BlktapController
|
|
out = stdout.read();
|
|
stdout.close();
|
|
stderr.close();
|
|
- raise Exception, 'Failed to create device.\n stdout: %s\n stderr: %s\nCheck that target \"%s\" exists and that blktap2 driver installed in dom0.' % (out.rstrip(), err.rstrip(), file);
|
|
+ raise VmError('Failed to create device.\n stdout: %s\n stderr: %s\nCheck that target \"%s\" exists and that blktap2 driver installed in dom0.' % (out.rstrip(), err.rstrip(), file));
|
|
|
|
minor, device, control = parseDeviceString(stdout.readline())
|
|
stdout.close();
|