[kernel] r17410 - in dists/lenny/linux-2.6/debian: . patches/bugfix/x86

[Dann Frazier]

Author: dannf
Date: Mon May 16 00:57:53 2011
New Revision: 17410

Log:
virtio: set pci bus master enable bit

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/x86/virtio-set-pci-bus-master-enable-bit.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Mon May 16 00:57:45 2011	(r17409)
+++ dists/lenny/linux-2.6/debian/changelog	Mon May 16 00:57:53 2011	(r17410)
@@ -20,6 +20,7 @@
     - [x86] tc1100-wmi: world-writable sysfs wireless and jogdial files
     - NFSD: memory corruption due to writing beyond the stat array
     - ext2: Fix link count corruption under heavy link+rename load
+    - virtio: set pci bus master enable bit
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 29 Nov 2010 02:01:24 +0000
 

Added: dists/lenny/linux-2.6/debian/patches/bugfix/x86/virtio-set-pci-bus-master-enable-bit.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/x86/virtio-set-pci-bus-master-enable-bit.patch	Mon May 16 00:57:53 2011	(r17410)
@@ -0,0 +1,32 @@
+commit c18fa2893211d4706911d90c8c64c291f08f33e5
+Author: Michael S. Tsirkin <mst at redhat.com>
+Date:   Sun Nov 29 17:52:00 2009 +0200
+
+    virtio: set pci bus master enable bit
+    
+    commit bc505f373979692d51a86d40925f77a8b09d17b9 upstream.
+    
+    As all virtio devices perform DMA, we
+    must enable bus mastering for them to be
+    spec compliant.
+    
+    This patch fixes hotplug of virtio devices
+    with Linux guests and qemu 0.11-0.12.
+    
+    Tested-by: Alexander Graf <agraf at suse.de>
+    Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
+    Cc: maximilian attems <max at stro.at>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
+index c7dc37c..19150e7 100644
+--- a/drivers/virtio/virtio_pci.c
++++ b/drivers/virtio/virtio_pci.c
+@@ -347,6 +347,7 @@ static int __devinit virtio_pci_probe(struct pci_dev *pci_dev,
+ 		goto out_req_regions;
+ 
+ 	pci_set_drvdata(pci_dev, vp_dev);
++	pci_set_master(pci_dev);
+ 
+ 	/* we use the subsystem vendor/device id as the virtio vendor/device
+ 	 * id.  this allows us to use the same PCI vendor/device id for all