Cc: Dexuan Cui <dexuan.cui@xxxxxxxxx>
Cc: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
Index: xen-unstable.hg/tools/python/xen/xend/server/pciif.py
===================================================================
--- xen-unstable.hg.orig/tools/python/xen/xend/server/pciif.py 2009-06-05
16:19:26.000000000 +1000
+++ xen-unstable.hg/tools/python/xen/xend/server/pciif.py 2009-06-07
21:49:07.000000000 +1000
@@ -301,8 +301,7 @@ class PciController(DevController):
# if arch.type != "ia64":
# dev.do_FLR()
- PCIQuirk(dev.vendor, dev.device, dev.subvendor, dev.subdevice, domain,
- bus, slot, func)
+ PCIQuirk(dev)
if not self.vm.info.is_hvm():
# Setup IOMMU device assignment
Index: xen-unstable.hg/tools/python/xen/xend/server/pciquirk.py
===================================================================
--- xen-unstable.hg.orig/tools/python/xen/xend/server/pciquirk.py
2009-06-05 16:19:20.000000000 +1000
+++ xen-unstable.hg/tools/python/xen/xend/server/pciquirk.py 2009-06-05
17:01:20.000000000 +1000
@@ -11,18 +11,19 @@ PERMISSIVE_CONFIG_FILE = auxbin.xen_conf
PERMISSIVE_SYSFS_NODE = "/sys/bus/pci/drivers/pciback/permissive"
class PCIQuirk:
- def __init__( self, vendor, device, subvendor, subdevice, domain, bus,
slot, func):
- self.vendor = vendor
- self.device = device
- self.subvendor = subvendor
- self.subdevice = subdevice
- self.domain = domain
- self.bus = bus
- self.slot = slot
- self.func = func
-
- self.devid = "%04x:%04x:%04x:%04x" % (vendor, device, subvendor,
subdevice)
- self.pciid = "%04x:%02x:%02x.%01x" % (domain, bus, slot, func)
+ def __init__(self, dev):
+ self.vendor = dev.vendor
+ self.device = dev.device
+ self.subvendor = dev.subvendor
+ self.subdevice = dev.subdevice
+ self.domain = dev.domain
+ self.bus = dev.bus
+ self.slot = dev.slot
+ self.func = dev.func
+
+ self.devid = "%04x:%04x:%04x:%04x" % (self.vendor, self.device,
+ self.subvendor, self.subdevice)
+ self.pciid = dev.name
self.quirks = self.__getQuirksByID()
self.__sendQuirks()
--
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home