ia64/xen-unstable

changeset 9648:07af1b34d4c4

I used the wrong operator in a couple places for putting together some
error messages out of format strings. This patch corrects those
operators and fixes the strings.

Signed-off-by: Ryan Wilson <hap9@epoch.ncsc.mil>
author emellor@leeni.uk.xensource.com
date Mon Apr 10 14:47:51 2006 +0100 (2006-04-10)
parents 4ed269ac7d84
children bdec77028194
files tools/python/xen/xend/server/pciif.py
line diff
     1.1 --- a/tools/python/xen/xend/server/pciif.py	Mon Apr 10 13:24:58 2006 +0100
     1.2 +++ b/tools/python/xen/xend/server/pciif.py	Mon Apr 10 14:47:51 2006 +0100
     1.3 @@ -115,7 +115,7 @@ class PciController(DevController):
     1.4              dev = PciDevice(domain, bus, slot, func)
     1.5          except Exception, e:
     1.6              raise VmError("pci: failed to locate device and "+
     1.7 -                    "parse it's resources - %s"+str(e))
     1.8 +                    "parse it's resources - "+str(e))
     1.9  
    1.10          if dev.driver!='pciback':
    1.11              raise VmError(("pci: PCI Backend does not own device "+ \
    1.12 @@ -131,7 +131,7 @@ class PciController(DevController):
    1.13                      nr_ports = size, allow_access = True)
    1.14              if rc<0:
    1.15                  raise VmError(('pci: failed to configure I/O ports on device '+
    1.16 -                            '%s - errno=%d')&(dev.name,rc))
    1.17 +                            '%s - errno=%d')%(dev.name,rc))
    1.18              
    1.19          for (start, size) in dev.iomem:
    1.20              # Convert start/size from bytes to page frame sizes
    1.21 @@ -147,7 +147,7 @@ class PciController(DevController):
    1.22                      allow_access = True)
    1.23              if rc<0:
    1.24                  raise VmError(('pci: failed to configure I/O memory on device '+
    1.25 -                            '%s - errno=%d')&(dev.name,rc))
    1.26 +                            '%s - errno=%d')%(dev.name,rc))
    1.27  
    1.28          if dev.irq>0:
    1.29              log.debug('pci: enabling irq %d'%dev.irq)
    1.30 @@ -155,7 +155,7 @@ class PciController(DevController):
    1.31                      allow_access = True)
    1.32              if rc<0:
    1.33                  raise VmError(('pci: failed to configure irq on device '+
    1.34 -                            '%s - errno=%d')&(dev.name,rc))
    1.35 +                            '%s - errno=%d')%(dev.name,rc))
    1.36  
    1.37      def waitForBackend(self,devid):
    1.38          return (0, "ok - no hotplug")