Commit d6f04f26 authored Oct 13, 2022 by Linus Torvalds

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull virtio fixes from Michael Tsirkin:

 - Fix a regression in virtio pci on power

 - Add a reviewer for ifcvf

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vdpa/ifcvf: add reviewer
  virtio_pci: use irq to detect interrupt support

parents aa41478a be8ddea9

MAINTAINERS

+4 −0

Original line number	Diff line number	Diff line
		@@ -21739,6 +21739,10 @@ F: include/linux/virtio*.h
		F: include/uapi/linux/virtio_*.h
		F: tools/virtio/

		IFCVF VIRTIO DATA PATH ACCELERATOR
		R: Zhu Lingshan <lingshan.zhu@intel.com>
		F: drivers/vdpa/ifcvf/

		VIRTIO BALLOON
		M: "Michael S. Tsirkin" <mst@redhat.com>
		M: David Hildenbrand <david@redhat.com>

drivers/virtio/virtio_pci_common.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -409,8 +409,8 @@ int vp_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
		err = vp_find_vqs_msix(vdev, nvqs, vqs, callbacks, names, false, ctx, desc);
		if (!err)
		return 0;
		/* Is there an interrupt pin? If not give up. */
		if (!(to_vp_device(vdev)->pci_dev->pin))
		/* Is there an interrupt? If not give up. */
		if (!(to_vp_device(vdev)->pci_dev->irq))
		return err;
		/* Finally fall back to regular interrupts. */
		return vp_find_vqs_intx(vdev, nvqs, vqs, callbacks, names, ctx);