[Xen-changelog] [xen-unstable] xend: pass-through: Use PCIDevice as the parameter for the constructor for PCIQuirk

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1245148742 -3600
# Node ID 4bc1347b9b865e049bda66af3b051573df859214
# Parent  11c3f4e786b3441ff0cc8121949988ff0d57d028
xend: pass-through: Use PCIDevice as the parameter for the constructor for 
PCIQuirk

Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
---
 tools/python/xen/xend/server/pciif.py    |    3 +--
 tools/python/xen/xend/server/pciquirk.py |   23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff -r 11c3f4e786b3 -r 4bc1347b9b86 tools/python/xen/xend/server/pciif.py
--- a/tools/python/xen/xend/server/pciif.py     Tue Jun 16 11:38:33 2009 +0100
+++ b/tools/python/xen/xend/server/pciif.py     Tue Jun 16 11:39:02 2009 +0100
@@ -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
diff -r 11c3f4e786b3 -r 4bc1347b9b86 tools/python/xen/xend/server/pciquirk.py
--- a/tools/python/xen/xend/server/pciquirk.py  Tue Jun 16 11:38:33 2009 +0100
+++ b/tools/python/xen/xend/server/pciquirk.py  Tue Jun 16 11:39:02 2009 +0100
@@ -11,18 +11,19 @@ PERMISSIVE_SYSFS_NODE = "/sys/bus/pci/dr
 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
+    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" % (vendor, device, subvendor, 
subdevice)
-        self.pciid = "%04x:%02x:%02x.%01x" % (domain, bus, slot, 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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog