From: Masaki Kanno Subject: [PATCH][RFC] Fix value set for uname of phantom tap devices Date: Thu, 18 Feb 2010 11:52:20 +0900 Message-ID: <14CAB04563DCC4kanno.masaki@jp.fujitsu.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-vbHGoJQ3HHDWwOXIm7t9V" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --Boundary-vbHGoJQ3HHDWwOXIm7t9V Content-Type: text/plain; charset=iso-2022-jp Content-Transfer-Encoding: 7bit Content-Description: Mail message body Hi, cfg_xenapi['image'] is always set to dev_info['uname'] even if cfg_xenapi['image'] does not include 'tap:'. I'm not sure about phantom tap devices. However, I think that the following patch is correct. How do you think? diff -r b4041e7bbe1b tools/python/xen/xend/XendConfig.py --- a/tools/python/xen/xend/XendConfig.py Wed Feb 17 12:11:13 2010 +0000 +++ b/tools/python/xen/xend/XendConfig.py Thu Feb 18 11:35:30 2010 +0900 @@ -1686,8 +1686,9 @@ elif dev_type == 'tap': if cfg_xenapi.get('image').find('tap:') == -1: dev_info['uname'] = 'tap:qcow:%s' % cfg_xenapi.get('image') + else: + dev_info['uname'] = cfg_xenapi.get('image') dev_info['dev'] = '/dev/%s' % cfg_xenapi.get('device') - dev_info['uname'] = cfg_xenapi.get('image') dev_info['mode'] = cfg_xenapi.get('mode') dev_info['backend'] = '0' dev_uuid = cfg_xenapi.get('uuid', uuid.createString()) Signed-off-by: Masaki Kanno Best regards, Kan --Boundary-vbHGoJQ3HHDWwOXIm7t9V Content-Type: application/octet-stream; name="phantom_device_add.patch" Content-Disposition: attachment; filename="phantom_device_add.patch" Content-Transfer-Encoding: base64 ZGlmZiAtciBiNDA0MWU3YmJlMWIgdG9vbHMvcHl0aG9uL3hlbi94ZW5kL1hlbmRDb25maWcu cHkKLS0tIGEvdG9vbHMvcHl0aG9uL3hlbi94ZW5kL1hlbmRDb25maWcucHkJV2VkIEZlYiAx NyAxMjoxMToxMyAyMDEwICswMDAwCisrKyBiL3Rvb2xzL3B5dGhvbi94ZW4veGVuZC9YZW5k Q29uZmlnLnB5CVRodSBGZWIgMTggMTE6MzU6MzAgMjAxMCArMDkwMApAQCAtMTY4Niw4ICsx Njg2LDkgQEAKICAgICAgICAgICAgICAgICBlbGlmIGRldl90eXBlID09ICd0YXAnOgogICAg ICAgICAgICAgICAgICAgICBpZiBjZmdfeGVuYXBpLmdldCgnaW1hZ2UnKS5maW5kKCd0YXA6 JykgPT0gLTE6CiAgICAgICAgICAgICAgICAgICAgICAgICBkZXZfaW5mb1sndW5hbWUnXSA9 ICd0YXA6cWNvdzolcycgJSBjZmdfeGVuYXBpLmdldCgnaW1hZ2UnKQorICAgICAgICAgICAg ICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgICAgICAgICAgZGV2X2luZm9bJ3VuYW1l J10gPSBjZmdfeGVuYXBpLmdldCgnaW1hZ2UnKQogICAgICAgICAgICAgICAgICAgICBkZXZf aW5mb1snZGV2J10gPSAgJy9kZXYvJXMnICUgY2ZnX3hlbmFwaS5nZXQoJ2RldmljZScpCi0g ICAgICAgICAgICAgICAgICAgIGRldl9pbmZvWyd1bmFtZSddID0gY2ZnX3hlbmFwaS5nZXQo J2ltYWdlJykKICAgICAgICAgICAgICAgICBkZXZfaW5mb1snbW9kZSddID0gY2ZnX3hlbmFw aS5nZXQoJ21vZGUnKQogICAgICAgICAgICAgICAgIGRldl9pbmZvWydiYWNrZW5kJ10gPSAn MCcKICAgICAgICAgICAgICAgICBkZXZfdXVpZCA9IGNmZ194ZW5hcGkuZ2V0KCd1dWlkJywg dXVpZC5jcmVhdGVTdHJpbmcoKSkK --Boundary-vbHGoJQ3HHDWwOXIm7t9V Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --Boundary-vbHGoJQ3HHDWwOXIm7t9V--