Changeset 13eecc4 in mainline

Timestamp:

2019-02-06T17:30:48Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e2f332c

Parents:

a1f173d

git-author:

Jakub Jermar <jakub@…> (2019-01-20 12:15:28)

git-committer:

Jakub Jermar <jakub@…> (2019-02-06 17:30:48)

Message:

Add virtio-blk driver

Files:

• boot/Makefile.common (modified) (1 diff)
• tools/ew.py (modified) (5 diffs)
• uspace/Makefile (modified) (1 diff)
• uspace/drv/block/virtio-blk/Makefile (added)
• uspace/drv/block/virtio-blk/virtio-blk.c (added)
• uspace/drv/block/virtio-blk/virtio-blk.h (added)
• uspace/drv/block/virtio-blk/virtio-blk.ma (added)
• uspace/lib/virtio/virtio.c (modified) (1 diff)

boot/Makefile.common

@@ -145 +145 @@
         nic/ar9271 \
         nic/virtio-net \
-        block/ahci
+        block/ahci \
+        block/virtio-blk
 
 RD_DRV_CFG =

tools/ew.py

@@ -135 +135 @@
         hdisk_mk()
 
-        return ' -drive file=hdisk.img,index=0,media=disk,format=raw'
+        hdd_options = ''
+        if 'hdd' in overrides.keys():
+                if 'ata' in overrides['hdd'].keys():
+                        hdd_options += ''
+                elif 'virtio-blk' in overrides['hdd'].keys():
+                        hdd_options += ',if=virtio'
+
+        return ' -drive file=hdisk.img,index=0,media=disk,format=raw' + hdd_options
 
 def qemu_nic_ne2k_options():
@@ -336 +343 @@
 def usage():
         print("%s - emulator wrapper for running HelenOS\n" % os.path.basename(sys.argv[0]))
-        print("%s [-d] [-h] [-net e1k|rtl8139|ne2k|virtio-net] [-nohdd] [-nokvm] [-nonet] [-nosnd] [-nousb] [-noxhci] [-notablet]\n" %
+        print("%s [-d] [-h] [-net e1k|rtl8139|ne2k|virtio-net] [-hdd ata|virtio-blk] [-nohdd] [-nokvm] [-nonet] [-nosnd] [-nousb] [-noxhci] [-notablet]\n" %
             os.path.basename(sys.argv[0]))
         print("-d\tDry run: do not run the emulation, just print the command line.")
@@ -357 +364 @@
 def run():
         expect_nic = False
+        expect_hdd = False
         expect_qemu = False
 
@@ -378 +386 @@
                         continue
 
+                if expect_hdd:
+                        expect_hdd = False
+                        if not 'hdd' in overrides.keys():
+                                overrides['hdd'] = {}
+                        if sys.argv[i] == 'ata':
+                                overrides['hdd']['ata'] = True
+                        elif sys.argv[i] == 'virtio-blk':
+                                overrides['hdd']['virtio-blk'] = True
+                        else:
+                                usage()
+                                exit()
+                        continue
+
                 if expect_qemu:
                         expect_qemu = False
@@ -389 +410 @@
                 elif sys.argv[i] == '-net' and i < len(sys.argv) - 1:
                         expect_nic = True
+                elif sys.argv[i] == '-hdd' and i < len(sys.argv) - 1:
+                        expect_hdd = True
                 elif sys.argv[i] == '-nohdd':
                         overrides['nohdd'] = True

uspace/Makefile

@@ -152 +152 @@
         drv/block/ddisk \
         drv/block/usbmast \
+        drv/block/virtio-blk \
         drv/bus/adb/cuda_adb \
         drv/bus/isa \

uspace/lib/virtio/virtio.c

@@ -63 +63 @@
         uintptr_t phys;
         errno_t rc = dmamem_map_anonymous(buffers * size, 0,
-            write ? AS_AREA_WRITE : AS_AREA_READ, 0, &phys, &virt);
+            write ? AS_AREA_WRITE | AS_AREA_READ : AS_AREA_READ, 0, &phys,
+            &virt);
         if (rc != EOK)
                 return rc;