--- drivers/virtio/virtio_pci.c

+++ drivers/virtio/virtio_pci.c

@@ -95,11 +95,6 @@ static struct pci_device_id virtio_pci_i

MODULE_DEVICE_TABLE(pci, virtio_pci_id_table);

-/* A PCI device has it's own struct device and so does a virtio device so

- * we create a place for the virtio devices to show up in sysfs. I think it

- * would make more sense for virtio to not insist on having it's own device. */

-static struct device *virtio_pci_root;

-

/* Convert a generic virtio device to our structure */

static struct virtio_pci_device *to_vp_device(struct virtio_device *vdev)

{

@@ -473,7 +468,8 @@ static void vp_del_vqs(struct virtio_dev

list_for_each_entry_safe(vq, n, &vdev->vqs, list) {

info = vq->priv;

- if (vp_dev->per_vq_vectors)

+ if (vp_dev->per_vq_vectors &&

+ info->msix_vector != VIRTIO_MSI_NO_VECTOR)

free_irq(vp_dev->msix_entries[info->msix_vector].vector,

vq);

vp_del_vq(vq);

@@ -627,13 +623,16 @@ static int __devinit virtio_pci_probe(st

if (vp_dev == NULL)

return -ENOMEM;

- vp_dev->vdev.dev.parent = virtio_pci_root;

+ vp_dev->vdev.dev.parent = &pci_dev->dev;

vp_dev->vdev.dev.release = virtio_pci_release_dev;

vp_dev->vdev.config = &virtio_pci_config_ops;

vp_dev->pci_dev = pci_dev;

INIT_LIST_HEAD(&vp_dev->virtqueues);

spin_lock_init(&vp_dev->lock);

+ /* Disable MSI/MSIX to bring device to a known good state. */

+ pci_msi_off(pci_dev);

+

/* enable the device */

err = pci_enable_device(pci_dev);

if (err)

@@ -648,6 +647,7 @@ static int __devinit virtio_pci_probe(st

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

@@ -711,17 +711,7 @@ static struct pci_driver virtio_pci_driv

static int __init virtio_pci_init(void)

{

- int err;

-

- virtio_pci_root = root_device_register("virtio-pci");

- if (IS_ERR(virtio_pci_root))

- return PTR_ERR(virtio_pci_root);

-

- err = pci_register_driver(&virtio_pci_driver);

- if (err)

- root_device_unregister(virtio_pci_root);

-

- return err;

+ return pci_register_driver(&virtio_pci_driver);

}

module_init(virtio_pci_init);

@@ -729,7 +719,6 @@ module_init(virtio_pci_init);

static void __exit virtio_pci_exit(void)

{

pci_unregister_driver(&virtio_pci_driver);

- root_device_unregister(virtio_pci_root);

}

module_exit(virtio_pci_exit);