rpms/libpciaccess/F-9 libpciaccess-no-pci-fix.patch, NONE, 1.1 libpciaccess.spec, 1.12, 1.13

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/libpciaccess/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4814

Modified Files:
	libpciaccess.spec 
Added Files:
	libpciaccess-no-pci-fix.patch 
Log Message:
* Tue May 20 2008 Adam Jackson <ajax at redhat.com> 0.10-3
- libpciaccess-no-pci-fix.patch: Fix init when /sys/bus/pci is empty or
  nonexistent.


libpciaccess-no-pci-fix.patch:

--- NEW FILE libpciaccess-no-pci-fix.patch ---
diff -up libpciaccess-0.10/src/common_iterator.c.nopci libpciaccess-0.10/src/common_iterator.c
--- libpciaccess-0.10/src/common_iterator.c.nopci	2008-03-06 15:22:48.000000000 -0500
+++ libpciaccess-0.10/src/common_iterator.c	2008-05-20 13:58:21.000000000 -0400
@@ -158,6 +158,9 @@ pci_device_next( struct pci_device_itera
 {
     struct pci_device_private * d = NULL;
 
+    if (!iter)
+	return NULL;
+
     switch( iter->mode ) {
     case match_any:
 	if ( iter->next_index < pci_sys->num_devices ) {
diff -up libpciaccess-0.10/src/linux_sysfs.c.nopci libpciaccess-0.10/src/linux_sysfs.c
--- libpciaccess-0.10/src/linux_sysfs.c.nopci	2008-05-20 13:54:47.000000000 -0400
+++ libpciaccess-0.10/src/linux_sysfs.c	2008-05-20 13:54:47.000000000 -0400
@@ -113,6 +113,9 @@ pci_system_linux_sysfs_create( void )
 	pci_sys = calloc( 1, sizeof( struct pci_system ) );
 	if ( pci_sys != NULL ) {
 	    pci_sys->methods = & linux_sysfs_methods;
+#ifdef HAVE_MTRR
+	    pci_sys->mtrr_fd = open("/proc/mtrr", O_WRONLY);
+#endif
 	    err = populate_entries(pci_sys);
 	}
 	else {
@@ -123,10 +126,6 @@ pci_system_linux_sysfs_create( void )
 	err = errno;
     }
 
-#ifdef HAVE_MTRR
-    pci_sys->mtrr_fd = open("/proc/mtrr", O_WRONLY);
-#endif
-
     return err;
 }
 


Index: libpciaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/F-9/libpciaccess.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libpciaccess.spec	22 Apr 2008 21:07:31 -0000	1.12
+++ libpciaccess.spec	20 May 2008 18:00:46 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:           libpciaccess
 Version:        0.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PCI access library
 
 Group:          System Environment/Libraries
@@ -19,6 +19,7 @@
 
 Patch0:		libpciaccess-fd-cache.patch
 Patch1:		libpciaccess-kludge-wc-mmap.patch
+Patch2:		libpciaccess-no-pci-fix.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig
 Requires:       hwdata
@@ -40,6 +41,7 @@
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .cache
 %patch1 -p1 -b .wc
+%patch2 -p1 -b .nopci
 
 %build
 #autoreconf -v --install
@@ -70,6 +72,10 @@
 %{_libdir}/pkgconfig/pciaccess.pc
 
 %changelog
+* Tue May 20 2008 Adam Jackson <ajax at redhat.com> 0.10-3
+- libpciaccess-no-pci-fix.patch: Fix init when /sys/bus/pci is empty or
+  nonexistent.
+
 * Mon Apr 21 2008 Dave Airlie <airlied at redhat.com> 0.10-2
 - fix major problem with libpciaccess and write combining.