From: Simon Horman Subject: [patch 4/9] xend: pass-through: prefix vslot with 0x in device configration Date: Thu, 04 Jun 2009 13:21:19 +1000 Message-ID: <20090604032230.204484526@vergenet.net> References: <20090604032115.934982694@vergenet.net> Return-path: Content-Disposition: inline; filename=0x-vslot-in-device-configuration.patch 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 Cc: Masaki Kanno , Dexuan Cui List-Id: xen-devel@lists.xenproject.org I don't know of the historical reasons for this, but by convention hex values are stored without a leading '0x' in the backend and with a leading '0x' in the device configuration. This patch also removes handling of the case where vslot is missing from the backend, should never occur. Cc: Dexuan Cui Cc: Masaki Kanno Signed-off-by: Simon Horman Index: xen-unstable.hg/tools/python/xen/xend/server/pciif.py =================================================================== --- xen-unstable.hg.orig/tools/python/xen/xend/server/pciif.py 2009-06-03 14:31:05.000000000 +1000 +++ xen-unstable.hg/tools/python/xen/xend/server/pciif.py 2009-06-03 14:31:45.000000000 +1000 @@ -191,11 +191,8 @@ class PciController(DevController): # Per device uuid info dev_dict['uuid'] = self.readBackend(devid, 'uuid-%d' % i) - vslot = self.readBackend(devid, 'vslot-%d' % i) - if vslot != None: - dev_dict['vslot'] = self.readBackend(devid, 'vslot-%d' % i) - else: - dev_dict['vslot'] = AUTO_PHP_SLOT_STR + dev_dict['vslot'] = '0x%s' % \ + self.readBackend(devid, 'vslot-%d' % i) #append opts info opts = self.readBackend(devid, 'opts-%d' % i) --