add backend device for direct host network bridge

[palacios.git] / palacios / src / devices / ide.c

diff --git a/palacios/src/devices/ide.c b/palacios/src/devices/ide.c
index 67a8928..8577e09 100644 (file)
--- a/palacios/src/devices/ide.c
+++ b/palacios/src/devices/ide.c
@@ -390,7 +390,7 @@ static void print_prd_table(struct vm_device * dev, struct ide_channel * channel
 static int dma_read(struct guest_info * core, struct vm_device * dev, struct ide_channel * channel) {
     struct ide_drive * drive = get_selected_drive(channel);
     // This is at top level scope to do the EOT test at the end
-    struct ide_dma_prd prd_entry;
+    struct ide_dma_prd prd_entry = {};
     uint_t bytes_left = drive->transfer_length;
 
     // Read in the data buffer....
@@ -530,7 +530,7 @@ static int dma_read(struct guest_info * core, struct vm_device * dev, struct ide
 static int dma_write(struct guest_info * core, struct vm_device * dev, struct ide_channel * channel) {
     struct ide_drive * drive = get_selected_drive(channel);
     // This is at top level scope to do the EOT test at the end
-    struct ide_dma_prd prd_entry;
+    struct ide_dma_prd prd_entry = {};
     uint_t bytes_left = drive->transfer_length;
 
 
@@ -1433,16 +1433,19 @@ static int init_ide_state(struct vm_device * dev) {
 
 static int ide_free(struct vm_device * dev) {
     // unhook io ports....
+
+
     // deregister from PCI?
+
+
+
     return 0;
 }
 
 
 static struct v3_device_ops dev_ops = {
     .free = ide_free,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
+
 };
 
 
@@ -1520,10 +1523,18 @@ static int connect_fn(struct v3_vm_info * vm,
 
 
 static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
-    struct ide_internal * ide  = (struct ide_internal *)V3_Malloc(sizeof(struct ide_internal));  
-    char * name = v3_cfg_val(cfg, "name");
+    struct ide_internal * ide  = NULL;
+    char * dev_id = v3_cfg_val(cfg, "ID");
 
     PrintDebug("IDE: Initializing IDE\n");
+
+    ide = (struct ide_internal *)V3_Malloc(sizeof(struct ide_internal));
+
+    if (ide == NULL) {
+       PrintError("Error allocating IDE state\n");
+       return -1;
+    }
+
     memset(ide, 0, sizeof(struct ide_internal));
 
 
@@ -1534,6 +1545,7 @@ static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
        if (!southbridge) {
            PrintError("Could not find southbridge\n");
+           V3_Free(ide);
            return -1;
        }
 
@@ -1542,15 +1554,18 @@ static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     PrintDebug("IDE: Creating IDE bus x 2\n");
 
-    struct vm_device * dev = v3_allocate_device(name, &dev_ops, ide);
+    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, ide);
 
     if (v3_attach_device(vm, dev) == -1) {
-       PrintError("Could not attach device %s\n", name);
+       PrintError("Could not attach device %s\n", dev_id);
+       v3_free_device(dev);
+       V3_Free(ide);
        return -1;
     }
 
     if (init_ide_state(dev) == -1) {
        PrintError("Failed to initialize IDE state\n");
+       v3_detach_device(dev);
        return -1;
     }
 
@@ -1660,8 +1675,9 @@ static int ide_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     }
 
-    if (v3_dev_add_blk_frontend(vm, name, connect_fn, (void *)ide) == -1) {
-       PrintError("Could not register %s as frontend\n", name);
+    if (v3_dev_add_blk_frontend(vm, dev_id, connect_fn, (void *)ide) == -1) {
+       PrintError("Could not register %s as frontend\n", dev_id);
+       v3_detach_device(dev);
        return -1;
     }
     
@@ -1694,6 +1710,3 @@ int v3_ide_get_geometry(struct vm_device * ide_dev, int channel_num, int drive_n
 
     return 0;
 }
-
-
-