changed configuration structure for block devices

[palacios.git] / palacios / src / palacios / vmm_config.c

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 4387f8b..f917f67 100644 (file)
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -1,4 +1,4 @@
-/* 
+ /* 
  * This file is part of the Palacios Virtual Machine Monitor developed
  * by the V3VEE Project with funding from the United States National 
  * Science Foundation and the Department of Energy.  
@@ -35,7 +35,9 @@
 #include <devices/generic.h>
 #include <devices/ide.h>
 #include <devices/ram_cd.h>
+#include <devices/net_cd.h>
 #include <devices/ram_hd.h>
+#include <devices/net_hd.h>
 #include <devices/bochs_debug.h>
 #include <devices/os_debug.h>
 #include <devices/apic.h>
@@ -51,7 +53,7 @@
 #define USE_GENERIC 1
 
 
-
+#include <palacios/vmm_socket.h>
 
 
 static int setup_memory_map(struct guest_info * info, struct v3_vm_config * config_ptr);
@@ -210,7 +212,8 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf
 static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) {
 
     struct vm_device * ide = NULL;
-    struct vm_device * ramdisk = NULL;
+    struct vm_device * primary_disk = NULL;
+    struct vm_device * secondary_disk = NULL;
     
     struct vm_device * pci = NULL;
     struct vm_device * northbridge = NULL;
@@ -242,29 +245,75 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
        ide = v3_create_ide(NULL, NULL);
     }
 
-
-
     nvram = v3_create_nvram(ide);
 
-    if (config_ptr->use_ram_cd == 1) {
-       PrintDebug("Creating Ram CD\n");
-       ramdisk = v3_create_ram_cd(ide, 0, 0, 
-                                  (addr_t)(config_ptr->ramdisk), 
-                                  config_ptr->ramdisk_size);
-    } else if (config_ptr->use_ram_hd == 1) {
-       PrintDebug("Creating Ram HD\n");
-       ramdisk = v3_create_ram_hd(ide, 0, 0, 
-                                  (addr_t)(config_ptr->ramdisk), 
-                                  config_ptr->ramdisk_size);
+    if (config_ptr->pri_disk_type != NONE) {
+       if (config_ptr->pri_disk_type == CDROM) {
+           if (config_ptr->pri_disk_con == RAM) {
+               PrintDebug("Creating RAM CD\n");
+               primary_disk = v3_create_ram_cd(ide, 0, 0, 
+                                               (addr_t)(config_ptr->pri_disk_info.ram.data_ptr), 
+                                               config_ptr->pri_disk_info.ram.size);
+           } else if (config_ptr->pri_disk_con == NETWORK) {
+               PrintDebug("Creating NET CD\n");
+               primary_disk = v3_create_net_cd(ide, 0, 0, 
+                                               config_ptr->pri_disk_info.net.ip_str,
+                                               config_ptr->pri_disk_info.net.port, 
+                                               config_ptr->pri_disk_info.net.disk_name);    
+           }
+       } else if (config_ptr->pri_disk_type == HARDDRIVE) {
+           if (config_ptr->pri_disk_con == RAM) {
+               PrintDebug("Creating RAM HD\n");
+               primary_disk = v3_create_ram_hd(ide, 0, 0, 
+                                               (addr_t)(config_ptr->pri_disk_info.ram.data_ptr), 
+                                               config_ptr->pri_disk_info.ram.size);
+           } else if (config_ptr->pri_disk_con == NETWORK) {
+               PrintDebug("Creating NET HD\n");
+               primary_disk = v3_create_net_hd(ide, 0, 0, 
+                                               config_ptr->pri_disk_info.net.ip_str,
+                                               config_ptr->pri_disk_info.net.port, 
+                                               config_ptr->pri_disk_info.net.disk_name);
+           }
+       }
     }
-    
-    
-    if (use_generic) {
-       generic = configure_generic(info, config_ptr);
+
+
+
+    if (config_ptr->sec_disk_type != NONE) {
+       if (config_ptr->sec_disk_type == CDROM) {
+           if (config_ptr->sec_disk_con == RAM) {
+               PrintDebug("Creating RAM CD\n");
+               secondary_disk = v3_create_ram_cd(ide, 0, 1, 
+                                                 (addr_t)(config_ptr->sec_disk_info.ram.data_ptr), 
+                                                 config_ptr->sec_disk_info.ram.size);
+           } else if (config_ptr->sec_disk_con == NETWORK) {
+               PrintDebug("Creating NET CD\n");
+               secondary_disk = v3_create_net_cd(ide, 0, 1, 
+                                                 config_ptr->sec_disk_info.net.ip_str,
+                                                 config_ptr->sec_disk_info.net.port, 
+                                                 config_ptr->sec_disk_info.net.disk_name);    
+           }
+       } else if (config_ptr->sec_disk_type == HARDDRIVE) {
+           if (config_ptr->sec_disk_con == RAM) {
+               PrintDebug("Creating RAM HD\n");
+               secondary_disk = v3_create_ram_hd(ide, 0, 1, 
+                                                 (addr_t)(config_ptr->sec_disk_info.ram.data_ptr), 
+                                                 config_ptr->sec_disk_info.ram.size);
+           } else if (config_ptr->sec_disk_con == NETWORK) {
+               PrintDebug("Creating NET HD\n");
+               secondary_disk = v3_create_net_hd(ide, 0, 1, 
+                                                 config_ptr->sec_disk_info.net.ip_str,
+                                                 config_ptr->sec_disk_info.net.port, 
+                                                 config_ptr->sec_disk_info.net.disk_name);
+           }
+       }
     }
 
 
 
+    if (use_generic) {
+       generic = configure_generic(info, config_ptr);
+    }
 
 
     v3_attach_device(info, pic);
@@ -291,8 +340,12 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_
     PrintDebug("Attaching IDE\n");
     v3_attach_device(info, ide);
 
-    if (ramdisk != NULL) {
-       v3_attach_device(info, ramdisk);
+    if (primary_disk != NULL) {
+       v3_attach_device(info, primary_disk);
+    }
+
+    if (secondary_disk != NULL) {
+       v3_attach_device(info, secondary_disk);
     }
 
     if (use_generic) {