[Xen-changelog] [linux-2.6.18-xen] DomU should scan all PCI fns.

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1189427733 -3600
# Node ID 81a8206f58c7d92ed271e3e8b337c0884e7e3423
# Parent  52f308b17bae6ff0182342be87898ee2eb922eb1
DomU should scan all PCI fns.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 include/asm-generic/pci.h             |    2 ++
 include/asm-i386/mach-xen/asm/pci.h   |    4 +++-
 include/asm-x86_64/mach-xen/asm/pci.h |    4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff -r 52f308b17bae -r 81a8206f58c7 include/asm-generic/pci.h
--- a/include/asm-generic/pci.h Sat Sep 08 10:02:52 2007 +0100
+++ b/include/asm-generic/pci.h Mon Sep 10 13:35:33 2007 +0100
@@ -43,7 +43,9 @@ pcibios_select_root(struct pci_dev *pdev
        return root;
 }
 
+#ifndef pcibios_scan_all_fns
 #define pcibios_scan_all_fns(a, b)     0
+#endif
 
 #ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
 static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
diff -r 52f308b17bae -r 81a8206f58c7 include/asm-i386/mach-xen/asm/pci.h
--- a/include/asm-i386/mach-xen/asm/pci.h       Sat Sep 08 10:02:52 2007 +0100
+++ b/include/asm-i386/mach-xen/asm/pci.h       Mon Sep 10 13:35:33 2007 +0100
@@ -14,7 +14,9 @@ extern unsigned int pcibios_assign_all_b
 #else
 #define pcibios_assign_all_busses()    0
 #endif
-#define pcibios_scan_all_fns(a, b)     0
+
+#include <asm/hypervisor.h>
+#define pcibios_scan_all_fns(a, b)     (!is_initial_xendomain())
 
 extern unsigned long pci_mem_start;
 #define PCIBIOS_MIN_IO         0x1000
diff -r 52f308b17bae -r 81a8206f58c7 include/asm-x86_64/mach-xen/asm/pci.h
--- a/include/asm-x86_64/mach-xen/asm/pci.h     Sat Sep 08 10:02:52 2007 +0100
+++ b/include/asm-x86_64/mach-xen/asm/pci.h     Mon Sep 10 13:35:33 2007 +0100
@@ -16,7 +16,9 @@ extern unsigned int pcibios_assign_all_b
 #else
 #define pcibios_assign_all_busses()    0
 #endif
-#define pcibios_scan_all_fns(a, b)     0
+
+#include <asm/hypervisor.h>
+#define pcibios_scan_all_fns(a, b)     (!is_initial_xendomain())
 
 extern unsigned long pci_mem_start;
 #define PCIBIOS_MIN_IO         0x1000

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