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

[sfrench/cifs-2.6.git] / include / linux / virtio_pci_modern.h

diff --git a/include/linux/virtio_pci_modern.h b/include/linux/virtio_pci_modern.h
index c4eeb79b01398eba88977e636f248096a07a8087..067ac1d789bcb64917c5cbef40791f4a04b50380 100644 (file)
--- a/include/linux/virtio_pci_modern.h
+++ b/include/linux/virtio_pci_modern.h
@@ -38,6 +38,12 @@ struct virtio_pci_modern_device {
        int modern_bars;
 
        struct virtio_device_id id;
+
+       /* optional check for vendor virtio device, returns dev_id or -ERRNO */
+       int (*device_id_check)(struct pci_dev *pdev);
+
+       /* optional mask for devices with limited DMA space */
+       u64 dma_mask;
 };
 
 /*