diff options
| author | Adam Jackson <ajax@benzedrine.nwnk.net> | 2006-09-14 19:26:37 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@benzedrine.nwnk.net> | 2006-09-14 19:26:37 -0400 |
| commit | 63acf18b7e4ce3a9f7deab3a9088a1c41cab0191 (patch) | |
| tree | 11b9f3fdba119d21e5284f1b0ad76df0c99c3d11 /hw/xfree86 | |
| parent | a8f9936f55c5364bb02e8c3187507eb1f70e2ef2 (diff) | |
In xf86MatchPciInstances, fail gracefully when there's no PCI device at all.
This allows the autoconfig logic to fall through sanely on non-PCI machines,
which importantly includes Xen virtual machines.
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/common/xf86Helper.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 851a345f2..c226bf2ea 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -1635,6 +1635,8 @@ xf86MatchPciInstances(const char *driverName, int vendorID, *foundEntities = NULL; + if (!xf86PciVideoInfo) + return 0; /* Each PCI device will contribute at least one entry. Each device * section can contribute at most one entry. The sum of the two is |