virtio-blk needs a block of 4 IRQs (currently - staticly defined).
Giving the initial IRQ of 15 causes breakage when adding more
than one device.

Signed-off-by: Sasha Levin <levinsasha...@gmail.com>
---
 tools/kvm/include/kvm/virtio-pci-dev.h |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tools/kvm/include/kvm/virtio-pci-dev.h 
b/tools/kvm/include/kvm/virtio-pci-dev.h
index 431289d..41125c2 100644
--- a/tools/kvm/include/kvm/virtio-pci-dev.h
+++ b/tools/kvm/include/kvm/virtio-pci-dev.h
@@ -31,10 +31,16 @@ enum {
 };
 
 enum {
-       VIRTIO_RNG_IRQ                          = 11,
-       VIRTIO_CONSOLE_IRQ                      = 13,
-       VIRTIO_NET_IRQ                          = 14,
-       VIRTIO_BLK_IRQ                          = 15,
+       VIRTIO_RNG_IRQ                          = 9,
+       VIRTIO_CONSOLE_IRQ                      = 10,
+       VIRTIO_NET_IRQ                          = 11,
+       VIRTIO_BLK_IRQ                          = 12,
+       /*
+        * FIXME: Currently IRQs 12-15 are reserved for possible
+        * virtio-blk devices. Static assignment will be avoided
+        * once dynamic IRQ assignment is added (or switch to
+        * MSI-X).
+        */
 };
 
 #endif /* VIRTIO_PCI_DEV_H_ */
-- 
1.7.5.rc3

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to