From 63acf18b7e4ce3a9f7deab3a9088a1c41cab0191 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 14 Sep 2006 19:26:37 -0400 Subject: [PATCH] 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. --- hw/xfree86/common/xf86Helper.c | 2 ++ 1 file changed, 2 insertions(+) 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