[Xen-changelog] [xen-unstable] xend: Fix tapdisk creation for managed domains

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1245752410 -3600
# Node ID bfbd7a85d2f87786725bc947b9be898a73d661ce
# Parent  aa472909b39c1228434c4550915ee3cc18c57bfe
xend: Fix tapdisk creation for managed domains

The first start of a managed domain succeeds.  But the second
start of the managed domain fails as follows.  The problem occurs
when tapdisks are given to the managed domain.  I think that the
problem occurs because the uname of tapdisks is overwritten with
"phy:/dev/xen/tadisk-2/tapdev*".

Signed-off-by: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
---
 tools/python/xen/xend/XendConfig.py              |    1 +
 tools/python/xen/xend/server/BlktapController.py |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff -r aa472909b39c -r bfbd7a85d2f8 tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Tue Jun 23 11:14:24 2009 +0100
+++ b/tools/python/xen/xend/XendConfig.py       Tue Jun 23 11:20:10 2009 +0100
@@ -1360,6 +1360,7 @@ class XendConfig(dict):
                 if dev_info['uname'].split(':')[1] not in blktap_disk_types:
                     raise XendConfigError("tap:%s not a valid disk type" %
                                     dev_info['uname'].split(':')[1])
+                dev_info['required_uname'] = dev_info['uname']
 
             if dev_type == 'vif':
                 if not dev_info.get('mac'):
diff -r aa472909b39c -r bfbd7a85d2f8 
tools/python/xen/xend/server/BlktapController.py
--- a/tools/python/xen/xend/server/BlktapController.py  Tue Jun 23 11:14:24 
2009 +0100
+++ b/tools/python/xen/xend/server/BlktapController.py  Tue Jun 23 11:20:10 
2009 +0100
@@ -120,7 +120,7 @@ class BlktapController(BlkifController):
 
     def createDevice(self, config):
 
-        uname = config.get('uname', '')
+        uname = config.get('required_uname', '')
         try:
             (typ, subtyp, params, file) = string.split(uname, ':', 3)
         except:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog