X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm.h;h=065021e8d521333d5bab9abd88cb4a3a5256026d;hb=ddd8ed1df60f75104096a8b6a9996ef5f462f594;hp=92ba2080abd9c2e3128b08f6e21b652bead0b2dd;hpb=153204955413dcb12b2156fc80bdda6e275009b9;p=palacios.git

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index 92ba208..065021e 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -268,6 +268,23 @@ struct v3_os_hooks {
 };
 
 
+
+typedef enum {NONE, HARDDRIVE, CDROM} v3_disk_type_t;
+typedef enum {RAM, NETWORK} v3_disk_connection_t;
+
+union v3_disk_info {
+    struct {
+	void * data_ptr;
+	int size;
+    } ram;
+
+    struct {
+	char * ip_str;
+	int port;
+	char * disk_name;
+    } net;
+};
+
 struct v3_vm_config {
     void * rombios;
     int rombios_size;
@@ -279,19 +296,18 @@ struct v3_vm_config {
     // so we can specify maximum physical address size
     // (We're screwed if we want to do 32 bit host/64 bit guest)
 
-
     int enable_profiling;
     int enable_nested_paging;
 
     int enable_pci;
-    
-    int use_ram_cd;
-    int use_ram_hd;
-    int use_net_cd;
-    int use_net_hd;
-
-    void * ramdisk;
-    int ramdisk_size;
+
+    v3_disk_type_t pri_disk_type;
+    v3_disk_connection_t pri_disk_con;
+    union v3_disk_info pri_disk_info;
+   
+    v3_disk_type_t sec_disk_type;
+    v3_disk_connection_t sec_disk_con;
+    union v3_disk_info sec_disk_info;
 };