summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2009-11-29 17:52:00 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-21 12:45:25 -0700
commit6104ea834d963524862c5565983f65089957b91b (patch)
treeec94c918bd1143e40cda954d5a996c3b5bbe1231
parent14bcdf0bc282f0ea21574d4fec4df15900ceb4c4 (diff)
downloadkernel-common-6104ea834d963524862c5565983f65089957b91b.tar.gz
kernel-common-6104ea834d963524862c5565983f65089957b91b.tar.bz2
kernel-common-6104ea834d963524862c5565983f65089957b91b.zip
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@suse.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Cc: maximilian attems <max@stro.at> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/virtio/virtio_pci.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index da5fc74e2616..77a0d5eb7fd0 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -644,6 +644,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