virtio: Use threads when scanning for virtio devices

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/src/hw/virtio-blk.c b/src/hw/virtio-blk.c
index 2dfd0c34bf8f509d5f4c71bfb91d8ad980001b1c..dca78556f4092bfec495a561e5e15997a79019a9 100644 (file)
--- a/src/hw/virtio-blk.c
+++ b/src/hw/virtio-blk.c
@@ -15,6 +15,7 @@
 #include "pcidevice.h" // foreachpci
 #include "pci_ids.h" // PCI_DEVICE_ID_VIRTIO_BLK
 #include "pci_regs.h" // PCI_VENDOR_ID
+#include "stacks.h" // run_thread
 #include "std/disk.h" // DISK_RET_SUCCESS
 #include "string.h" // memset
 #include "util.h" // usleep
@@ -93,8 +94,9 @@ virtio_blk_process_op(struct disk_op_s *op)
 }
 
 static void
-init_virtio_blk(struct pci_device *pci)
+init_virtio_blk(void *data)
 {
+    struct pci_device *pci = data;
     u8 status = VIRTIO_CONFIG_S_ACKNOWLEDGE | VIRTIO_CONFIG_S_DRIVER;
     dprintf(1, "found virtio-blk at %pP\n", pci);
     struct virtiodrive_s *vdrive = malloc_fseg(sizeof(*vdrive));
@@ -203,6 +205,6 @@ virtio_blk_setup(void)
             (pci->device != PCI_DEVICE_ID_VIRTIO_BLK_09 &&
              pci->device != PCI_DEVICE_ID_VIRTIO_BLK_10))
             continue;
-        init_virtio_blk(pci);
+        run_thread(init_virtio_blk, pci);
     }
 }

diff --git a/src/hw/virtio-scsi.c b/src/hw/virtio-scsi.c
index 322d469173b943aa4a1aa692c3c0578bd3a89baa..5fb9409f4ed7b96bbd5158d6a53f5eae6a08aa98 100644 (file)
--- a/src/hw/virtio-scsi.c
+++ b/src/hw/virtio-scsi.c
@@ -16,6 +16,7 @@
 #include "pcidevice.h" // foreachpci
 #include "pci_ids.h" // PCI_DEVICE_ID_VIRTIO_BLK
 #include "pci_regs.h" // PCI_VENDOR_ID
+#include "stacks.h" // run_thread
 #include "std/disk.h" // DISK_RET_SUCCESS
 #include "string.h" // memset
 #include "util.h" // usleep
@@ -132,8 +133,9 @@ virtio_scsi_scan_target(struct pci_device *pci, struct vp_device *vp,
 }
 
 static void
-init_virtio_scsi(struct pci_device *pci)
+init_virtio_scsi(void *data)
 {
+    struct pci_device *pci = data;
     dprintf(1, "found virtio-scsi at %pP\n", pci);
     struct vring_virtqueue *vq = NULL;
     struct vp_device *vp = malloc_high(sizeof(*vp));
@@ -199,6 +201,6 @@ virtio_scsi_setup(void)
             (pci->device != PCI_DEVICE_ID_VIRTIO_SCSI_09 &&
              pci->device != PCI_DEVICE_ID_VIRTIO_SCSI_10))
             continue;
-        init_virtio_scsi(pci);
+        run_thread(init_virtio_scsi, pci);
     }
 }