From: Pekka Enberg <penberg@kernel.org>
Date: Tue, 4 Jan 2011 16:21:35 +0000 (+0200)
Subject: Revert "kvm: Fix virtio block PCI device IRQ configuration"
X-Git-Tag: next-20110824~3^2~528^2~39
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c945e89ee1c1fb4b6a7f8823800bec33fee2b0eb;p=karo-tx-linux.git

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 6419b681b174..a0ff64ae03a7 100644
--- 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 1fd930181bb0..c12d3d0ad5a0 100644
--- 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);