summaryrefslogtreecommitdiffstats
path: root/drivers/virtio/virtio_pci_common.h
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2017-04-04 20:09:20 +0200
committerMichael S. Tsirkin <mst@redhat.com>2017-04-10 23:28:41 +0200
commit2008c1544c73d5190f81ef1790fa5bd2fade5bd0 (patch)
tree2569fe5b0deec35bdad7dddd93e794a204fbac5e /drivers/virtio/virtio_pci_common.h
parentRevert "virtio_pci: simplify MSI-X setup" (diff)
downloadlinux-2008c1544c73d5190f81ef1790fa5bd2fade5bd0.tar.xz
linux-2008c1544c73d5190f81ef1790fa5bd2fade5bd0.zip
Revert "virtio_pci: don't duplicate the msix_enable flag in struct pci_dev"
This reverts commit 53a020c661741f3b87ad3ac6fa545088aaebac9b. The cleanup seems to be one of the changes that broke hybernation for some users. We are still not sure why but revert helps. Tested-by: Mike Galbraith <efault@gmx.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/virtio/virtio_pci_common.h')
-rw-r--r--drivers/virtio/virtio_pci_common.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/virtio/virtio_pci_common.h b/drivers/virtio/virtio_pci_common.h
index ac8c9d788964..c8074997fd28 100644
--- a/drivers/virtio/virtio_pci_common.h
+++ b/drivers/virtio/virtio_pci_common.h
@@ -64,6 +64,8 @@ struct virtio_pci_device {
/* the IO mapping for the PCI config space */
void __iomem *ioaddr;
+ /* MSI-X support */
+ int msix_enabled;
cpumask_var_t *msix_affinity_masks;
/* Name strings for interrupts. This size should be enough,
* and I'm too lazy to allocate each name separately. */