diff --git a/blk-virtio.c b/blk-virtio.c
index 906ab8b..a53bdcc 100644
--- a/blk-virtio.c
+++ b/blk-virtio.c
@@ -107,8 +107,7 @@ 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,
-	/* XXX: Is this IRQ setup OK? */
-	.irq_pin		= 1,
+	.irq_pin		= 0,
 	.irq_line		= VIRTIO_BLK_IRQ,
 };
 
diff --git a/main.c b/main.c
index c12d3d0..1fd9301 100644
--- a/main.c
+++ b/main.c
@@ -51,7 +51,6 @@ 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;
 
@@ -73,9 +72,6 @@ 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)
@@ -121,9 +117,7 @@ int main(int argc, char *argv[])
 
 	early_printk__init();
 	pci__init();
-
-	if (enable_virtio)
-		blk_virtio__init();
+	blk_virtio__init();
 
 	for (;;) {
 		kvm__run(kvm);