# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1245397408 -3600
# Node ID f3211c71e8f0a9a704804256980cd49a41620aa6
# Parent  c3a94ac4c03172d31eab8899013f9253592fe20f
xend: fix BlktapController's device creation

Reset BlktapController's device class back to 'tap' once the device
has been created. This fixes save/restore for VMs with blktap2 disks.

Signed-off-by: Ryan O'Connor <rjo@cs.ubc.ca>
Signed-off-by: Dutch Meyer <dmeyer@cs.ubc.ca>

diff -r c3a94ac4c031 -r f3211c71e8f0 tools/python/xen/xend/server/BlktapController.py
--- a/tools/python/xen/xend/server/BlktapController.py	Fri Jun 19 08:42:58 2009 +0100
+++ b/tools/python/xen/xend/server/BlktapController.py	Fri Jun 19 08:43:28 2009 +0100
@@ -159,6 +159,8 @@ class BlktapController(BlkifController):
         #modify the configuration to attach as a vbd, now that the
         #device is configured.  Then continue to create the device
         config.update({'uname' : 'phy:' + device.rstrip()})
+
         self.deviceClass='vbd'
-
-        return BlkifController.createDevice(self, config);
+        devid = BlkifController.createDevice(self, config)
+        self.deviceClass='tap'
+        return devid