Update to latest sDDF (block interface changes)

Need to fixup the UIO block driver after the error messages
PR gets merged as well.

Signed-off-by: Ivan Velickovic <[email protected]>

examples/virtio/client_vmm.c

@@ -79,7 +79,7 @@ void init(void)
     blk_storage_info_t *storage_info = (blk_storage_info_t *)blk_config;
 
     /* Busy wait until blk device is ready */
-    while (!__atomic_load_n(&storage_info->ready, __ATOMIC_ACQUIRE));
+    while (!blk_storage_is_ready(storage_info));
 
     /* Initialise the VMM, the VCPU(s), and start the guest */
     LOG_VMM("starting \"%s\"\n", microkit_name);

examples/virtio/include/blk_config.h

@@ -8,6 +8,7 @@
 
 #include <sddf/util/string.h>
 #include <sddf/blk/queue.h>
+#include <sddf/blk/storage_info.h>
 
 #define BLK_NUM_CLIENTS 2
 

include/libvmm/virtio/block.h

@@ -37,6 +37,7 @@
 #include <sddf/util/fsmalloc.h>
 #include <sddf/util/ialloc.h>
 #include <sddf/blk/queue.h>
+#include <sddf/blk/storage_info.h>
 
 /* Feature bits */
 #define VIRTIO_BLK_F_SIZE_MAX       1   /* Indicates maximum segment size */

tools/linux/uio_drivers/blk/blk.c

@@ -156,7 +156,7 @@ void driver_notified()
             int ret = lseek(storage_fd, (off_t)req_block_number * BLK_TRANSFER_SIZE, SEEK_SET);
             if (ret < 0) {
                 LOG_UIO_BLOCK_ERR("Failed to seek in storage: %s\n", strerror(errno));
-                status = BLK_RESP_SEEK_ERROR;
+                status = BLK_RESP_ERR_UNSPEC;
                 success_count = 0;
                 break;
             }
@@ -165,7 +165,7 @@ void driver_notified()
             LOG_UIO_BLOCK("Read from storage successfully: %d bytes\n", bytes_read);
             if (bytes_read < 0) {
                 LOG_UIO_BLOCK_ERR("Failed to read from storage: %s\n", strerror(errno));
-                status = BLK_RESP_SEEK_ERROR;
+                status = BLK_RESP_ERR_UNSPEC;
                 success_count = 0;
             } else {
                 status = BLK_RESP_OK;
@@ -177,7 +177,7 @@ void driver_notified()
             int ret = lseek(storage_fd, (off_t)req_block_number * BLK_TRANSFER_SIZE, SEEK_SET);
             if (ret < 0) {
                 LOG_UIO_BLOCK_ERR("Failed to seek in storage: %s\n", strerror(errno));
-                status = BLK_RESP_SEEK_ERROR;
+                status = BLK_RESP_ERR_UNSPEC;
                 success_count = 0;
                 break;
             }
@@ -186,7 +186,7 @@ void driver_notified()
             LOG_UIO_BLOCK("Wrote to storage successfully: %d bytes\n", bytes_written);
             if (bytes_written < 0) {
                 LOG_UIO_BLOCK_ERR("Failed to write to storage: %s\n", strerror(errno));
-                status = BLK_RESP_SEEK_ERROR;
+                status = BLK_RESP_ERR_UNSPEC;
                 success_count = 0;
             } else {
                 status = BLK_RESP_OK;
@@ -198,7 +198,7 @@ void driver_notified()
             int ret = fsync(storage_fd);
             if (ret != 0) {
                 LOG_UIO_BLOCK_ERR("Failed to flush storage: %s\n", strerror(errno));
-                status = BLK_RESP_SEEK_ERROR;
+                status = BLK_RESP_ERR_UNSPEC;
             } else {
                 status = BLK_RESP_OK;
             }
@@ -208,7 +208,7 @@ void driver_notified()
             int ret = fsync(storage_fd);
             if (ret != 0) {
                 LOG_UIO_BLOCK_ERR("Failed to flush storage: %s\n", strerror(errno));
-                status = BLK_RESP_SEEK_ERROR;
+                status = BLK_RESP_ERR_UNSPEC;
             } else {
                 status = BLK_RESP_OK;
             }