Revert "kvm: Fix virtio block PCI device IRQ configuration"

This reverts commit 00b793d98754629f833d5a3003554f841e64ec45.

diff --git a/tools/kvm/blk-virtio.c b/tools/kvm/blk-virtio.c
index 6419b681b1749243e93997664c4fa88552deb5d5..a0ff64ae03a79e820c1e82cdf4567c8318f47d60 100644 (file)
--- a/tools/kvm/blk-virtio.c
+++ b/tools/kvm/blk-virtio.c
@@ -112,7 +112,8 @@ static struct pci_device_header blk_virtio_pci_device = {
        .subsys_vendor_id       = PCI_SUBSYSTEM_VENDOR_ID_REDHAT_QUMRANET,
        .subsys_id              = PCI_SUBSYSTEM_ID_VIRTIO_BLK,
        .bar[0]                 = IOPORT_VIRTIO | PCI_BASE_ADDRESS_SPACE_IO,
-       .irq_pin                = 0,
+       /* XXX: Is this IRQ setup OK? */
+       .irq_pin                = 1,
        .irq_line               = VIRTIO_BLK_IRQ,
 };
 

diff --git a/tools/kvm/main.c b/tools/kvm/main.c
index 1fd930181bb0f8e302909d42b8e2a21220ae3197..c12d3d0ad5a0f3a8c2d367e84694c96d02c3f940 100644 (file)
--- a/tools/kvm/main.c
+++ b/tools/kvm/main.c
@@ -51,6 +51,7 @@ int main(int argc, char *argv[])
        const char *kernel_cmdline = NULL;
        const char *kvm_dev = "/dev/kvm";
        unsigned long ram_size = 64UL << 20;
+       bool enable_virtio = false;
        bool single_step = false;
        int i;
 
@@ -72,6 +73,9 @@ int main(int argc, char *argv[])
                } else if (option_matches(argv[i], "--single-step")) {
                        single_step     = true;
                        continue;
+               } else if (option_matches(argv[i], "--enable-virtio")) {
+                       enable_virtio   = true;
+                       continue;
                } else if (option_matches(argv[i], "--mem=")) {
                        unsigned long val = atol(&argv[i][6]) << 20;
                        if (val < ram_size)
@@ -117,7 +121,9 @@ int main(int argc, char *argv[])
 
        early_printk__init();
        pci__init();
-       blk_virtio__init();
+
+       if (enable_virtio)
+               blk_virtio__init();
 
        for (;;) {
                kvm__run(kvm);