X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Flnx_virtio_blk.c;h=fd9ec6191842c5dd41e5cbf89262484a0fc73444;hb=8a3dbb70c29175bad79764a0b2f3961b98138bb2;hp=6cb8fa33f9a539479cedd2b33d992fd5a12b5502;hpb=e2964f7234daa3429275c039769a313f0870c212;p=palacios.git

diff --git a/palacios/src/devices/lnx_virtio_blk.c b/palacios/src/devices/lnx_virtio_blk.c
index 6cb8fa3..fd9ec61 100644
--- a/palacios/src/devices/lnx_virtio_blk.c
+++ b/palacios/src/devices/lnx_virtio_blk.c
@@ -26,7 +26,7 @@
 
 
 
-#ifndef CONFIG_DEBUG_VIRTIO_BLK
+#ifndef V3_CONFIG_DEBUG_VIRTIO_BLK
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -104,9 +104,7 @@ struct virtio_blk_state {
 };
 
 
-static int virtio_free(struct vm_device * dev) {
-    return -1;
-}
+
 
 static int blk_reset(struct virtio_blk_state * virtio) {
 
@@ -409,38 +407,44 @@ static int virtio_io_read(struct guest_info * core, uint16_t port, void * dst, u
     PrintDebug("VIRTIO BLOCK Read  for port %d (index =%d), length=%d\n", 
 	       port, port_idx, length);
 
+
     switch (port_idx) {
 	case HOST_FEATURES_PORT:
-	    if (length != 4) {
-		PrintError("Illegal read length for host features\n");
+	case HOST_FEATURES_PORT + 1:
+	case HOST_FEATURES_PORT + 2:
+	case HOST_FEATURES_PORT + 3:
+	    if (port_idx + length > HOST_FEATURES_PORT + 4) {
+		PrintError("Illegal read length for host features (len=%d)\n", length);
 		return -1;
 	    }
 
-	    *(uint32_t *)dst = blk_state->virtio_cfg.host_features;
-	
+	    memcpy(dst, &(blk_state->virtio_cfg.host_features), length);
 	    break;
 	case VRING_PG_NUM_PORT:
-	    if (length != 4) {
-		PrintError("Illegal read length for page frame number\n");
+	case VRING_PG_NUM_PORT + 1:
+	case VRING_PG_NUM_PORT + 2:
+	case VRING_PG_NUM_PORT + 3:
+	    if (port_idx + length > VRING_PG_NUM_PORT + 4) {
+		PrintError("Illegal read length for vring pg num (len=%d)\n", length);
 		return -1;
 	    }
 
-	    *(uint32_t *)dst = blk_state->queue.pfn;
-
+	    memcpy(dst, &(blk_state->queue.pfn), length);
 	    break;
 	case VRING_SIZE_PORT:
-	    if (length != 2) {
-		PrintError("Illegal read length for vring size\n");
+	case VRING_SIZE_PORT + 1:
+	    if (length > 2) {
+		PrintError("Illegal read length for vring size (len=%d)\n", length);
 		return -1;
 	    }
-		
-	    *(uint16_t *)dst = blk_state->queue.queue_size;
+	    
+	    memcpy(dst, &(blk_state->queue.queue_size), length);
 
 	    break;
 
 	case VIRTIO_STATUS_PORT:
 	    if (length != 1) {
-		PrintError("Illegal read length for status\n");
+		PrintError("Illegal read length for status (len=%d)\n", length);
 		return -1;
 	    }
 
@@ -473,10 +477,28 @@ static int virtio_io_read(struct guest_info * core, uint16_t port, void * dst, u
 }
 
 
+static int virtio_free(struct virtio_dev_state * virtio) {
+    struct virtio_blk_state * blk_state = NULL;
+    struct virtio_blk_state * tmp = NULL;
+
+    list_for_each_entry_safe(blk_state, tmp, &(virtio->dev_list), dev_link) {
+
+	// unregister from PCI
+
+	list_del(&(blk_state->dev_link));
+	V3_Free(blk_state);
+    }
+    
+
+    V3_Free(virtio);
+
+    return 0;
+}
+
 
 
 static struct v3_device_ops dev_ops = {
-    .free = virtio_free,
+    .free = (int (*)(void *))virtio_free,
 
 };
 
@@ -550,6 +572,10 @@ static int register_dev(struct virtio_dev_state * virtio, struct virtio_blk_stat
     
     
     blk_state->pci_dev = pci_dev;
+
+
+    /* Add backend to list of devices */
+    list_add(&(blk_state->dev_link), &(virtio->dev_list));
     
     /* Block configuration */
     blk_state->virtio_cfg.host_features = VIRTIO_SEG_MAX;
@@ -612,14 +638,17 @@ static int virtio_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     virtio_state->pci_bus = pci_bus;
 
 
-    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, virtio_state);
-    if (v3_attach_device(vm, dev) == -1) {
+    struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, virtio_state);
+
+    if (dev == NULL) {
 	PrintError("Could not attach device %s\n", dev_id);
+	V3_Free(virtio_state);
 	return -1;
     }
 
     if (v3_dev_add_blk_frontend(vm, dev_id, connect_fn, (void *)virtio_state) == -1) {
 	PrintError("Could not register %s as block frontend\n", dev_id);
+	v3_remove_device(dev);
 	return -1;
     }