rpms/xorg-x11-server/devel xserver-1.5.1-int10-leaks.patch, NONE, 1.1 xorg-x11-server.spec, 1.359, 1.360

Adam Jackson ajax at fedoraproject.org
Tue Oct 7 17:48:10 UTC 2008


Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4406

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.1-int10-leaks.patch 
Log Message:
* Tue Oct 07 2008 Adam Jackson <ajax at redhat.com> 1.5.1-8
- xserver-1.5.1-int10-leaks.patch: Shut up some useless int10 debugging and
  plug a memory leak.


xserver-1.5.1-int10-leaks.patch:

--- NEW FILE xserver-1.5.1-int10-leaks.patch ---
>From ce4ce1c26d9b7db94e36c72523ef2b05f0716287 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Tue, 7 Oct 2008 13:45:58 -0400
Subject: [PATCH] Plug int10 memory leak and shut up useless warnings.

---
 hw/xfree86/int10/helper_exec.c |   14 +-------------
 1 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index c3af5bc..fa1516b 100644
--- a/hw/xfree86/int10/helper_exec.c
+++ b/hw/xfree86/int10/helper_exec.c
@@ -480,20 +480,8 @@ pci_device_for_cfg_address (CARD32 addr)
 	    pci_slot_match_iterator_create (&slot_match);
 	if (iter)
 		dev = pci_device_next(iter);
-	if (!dev) {
-		char buf[128]; /* enough to store "%u@%u" */
-		xf86FormatPciBusNumber(tag >> 16, buf);
-		ErrorF("Failed to find device matching %s:%u:%u\n",
-				buf, slot_match.dev, slot_match.func);
-		return NULL;
-	}
 
-	if (pci_device_next(iter)) {
-		char buf[128]; /* enough to store "%u@%u" */
-		xf86FormatPciBusNumber(tag >> 16, buf);
-		ErrorF("Multiple devices matching %s:%u:%u\n",
-				buf, slot_match.dev, slot_match.func);
-	}
+	pci_iterator_destroy(iter);
 
 	return dev;
 }
-- 
1.6.0.1



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- xorg-x11-server.spec	7 Oct 2008 15:35:36 -0000	1.359
+++ xorg-x11-server.spec	7 Oct 2008 17:47:40 -0000	1.360
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.1
-Release:   7%{?dist}
+Release:   8%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -85,6 +85,9 @@
 # force mode debugging on for randr 1.2 drivers
 Patch6003: xserver-1.5.1-mode-debug.patch
 
+# backport int10 silence and memory leaks
+Patch6004: xserver-1.5.1-int10-leaks.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -515,6 +518,10 @@
 
 
 %changelog
+* Tue Oct 07 2008 Adam Jackson <ajax at redhat.com> 1.5.1-8
+- xserver-1.5.1-int10-leaks.patch: Shut up some useless int10 debugging and
+  plug a memory leak.
+
 * Tue Oct 7 2008 Adam Jackson <ajax at redhat.com> 1.5.1-7
 - xserver-1.5.1-mode-debug.patch: Force mode debugging on.
 




More information about the fedora-extras-commits mailing list