X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Flnx_virtio_blk.c;h=7e26b3081566e8d51d71a2cc4dedc4376d81f422;hb=fdb16aa5e99a19a91264ae84beaf77d3036548d5;hp=5651b7eecb319c90b9b8e414a733fa20559ae744;hpb=14fa18cc54571eaa7aaa0f7d55677bdb4dad81a6;p=palacios.git

diff --git a/palacios/src/devices/lnx_virtio_blk.c b/palacios/src/devices/lnx_virtio_blk.c
index 5651b7e..7e26b30 100644
--- a/palacios/src/devices/lnx_virtio_blk.c
+++ b/palacios/src/devices/lnx_virtio_blk.c
@@ -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) {
 
@@ -122,16 +120,7 @@ static int blk_reset(struct virtio_blk_state * virtio) {
 }
 
 
-static int virtio_reset(struct vm_device * dev) {
-    struct virtio_dev_state * dev_state = (struct virtio_dev_state *)(dev->private_data);
-    struct virtio_blk_state * blk_state = NULL;
 
-    list_for_each_entry(blk_state, &(dev_state->dev_list), dev_link) {
-	blk_reset(blk_state);
-    }
-
-    return 0;
-}
 
 static int handle_read_op(struct virtio_blk_state * blk_state, uint8_t * buf, uint64_t * sector, uint64_t len) {
     int ret = -1;
@@ -482,13 +471,29 @@ 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,
-    .reset = virtio_reset,
-    .start = NULL,
-    .stop = NULL,
+    .free = (int (*)(void *))virtio_free,
+
 };
 
 
@@ -561,6 +566,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;
@@ -606,7 +615,7 @@ static int connect_fn(struct v3_vm_info * vm,
 static int virtio_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct vm_device * pci_bus = v3_find_dev(vm, v3_cfg_val(cfg, "bus"));
     struct virtio_dev_state * virtio_state = NULL;
-    char * name = v3_cfg_val(cfg, "name");
+    char * dev_id = v3_cfg_val(cfg, "ID");
 
     PrintDebug("Initializing VIRTIO Block device\n");
 
@@ -623,14 +632,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(name, &dev_ops, virtio_state);
-    if (v3_attach_device(vm, dev) == -1) {
-	PrintError("Could not attach device %s\n", name);
+    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, name, connect_fn, (void *)virtio_state) == -1) {
-	PrintError("Could not register %s as block frontend\n", name);
+    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;
     }