[PATCH] Dom0 PCI: fix a regression introduced by the SR-IOV change

[Yu Zhao <yu.zhao@intel.com>]

[-- Attachment #1: Type: text/plain, Size: 300 bytes --]

The device class may be changed during the early fixup. So need to
re-read the device class from pci_dev after the fixup.

The patch "PCI: centralize device setup code" (c/s 825) wrongly cleaned
up the device class re-read. This patch reverts that change.

Signed-off-by: Yu Zhao <yu.zhao@intel.com>

[-- Attachment #2: 00.patch --]
[-- Type: text/x-patch, Size: 957 bytes --]

# HG changeset patch
# User Yu Zhao <yu.zhao@intel.com>
# Date 1244007008 -28800
# Node ID ec3442c2ed48eb11fcacd3fe31af48932f0a6645
# Parent  97e0d58411d4cee30c16ee1f81d23b72ec7f107c
PCI: fix a regression introduced by the SR-IOV change

The device class may be changed during the early fixup. So need to
re-read the device class from pci_dev after the fixup.

The patch "PCI: centralize device setup code" (c/s 825) wrongly cleaned
up the device class re-read. This patch reverts that change.

Signed-off-by: Yu Zhao <yu.zhao@intel.com>

diff -r 97e0d58411d4 -r ec3442c2ed48 drivers/pci/probe.c
--- a/drivers/pci/probe.c	Tue Jun 02 23:43:55 2009 +0100
+++ b/drivers/pci/probe.c	Wed Jun 03 13:30:08 2009 +0800
@@ -721,6 +721,7 @@
 
 	/* Early fixups, before probing the BARs */
 	pci_fixup_device(pci_fixup_early, dev);
+	class = dev->class >> 8;
 
 	switch (dev->hdr_type) {		    /* header type */
 	case PCI_HEADER_TYPE_NORMAL:		    /* standard header */

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel