X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=fa4fe80cee113e2984ab706aa88c415ccce48adf;hb=817bfdf21efed4b95ba68f53b81540cc3a11d14a;hp=88c1ebc7f7aaa487f41c571e7c7060b77be03652;hpb=e70e95962c26832628d586e07f9cd1a2e1852d72;p=palacios.releases.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 88c1ebc..fa4fe80 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -29,10 +29,26 @@
 #include <devices/nvram.h>
 #include <devices/generic.h>
 #include <devices/ramdisk.h>
+#include <devices/cdrom.h>
 
 
 #define USE_GENERIC 1
-#define USE_RAMDISK 1
+
+#define MAGIC_CODE 0xf1e2d3c4
+
+
+
+struct layout_region {
+  ulong_t length;
+  ulong_t final_addr;
+};
+
+struct guest_mem_layout {
+  ulong_t magic;
+  ulong_t num_regions;
+  struct layout_region regions[0];
+};
+
 
 
 
@@ -76,14 +92,14 @@ static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, v
 }
 */
 
-int config_guest(struct guest_info * info, void * config_ptr) {
+int config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
 
-  struct guest_mem_layout * layout = (struct guest_mem_layout *)config_ptr;
+  struct guest_mem_layout * layout = (struct guest_mem_layout *)config_ptr->vm_kernel;
   extern v3_cpu_arch_t v3_cpu_type;
   void * region_start;
   int i;
 
-  int use_ramdisk = USE_RAMDISK;
+  int use_ramdisk = config_ptr->use_ramdisk;
   int use_generic = USE_GENERIC;
 
 
@@ -183,19 +199,23 @@ int config_guest(struct guest_info * info, void * config_ptr) {
   
   {
     struct vm_device * ramdisk = NULL;
+    struct vm_device * cdrom = NULL;
     struct vm_device * nvram = create_nvram();
     //struct vm_device * timer = create_timer();
     struct vm_device * pic = create_pic();
     struct vm_device * keyboard = create_keyboard();
     struct vm_device * pit = create_pit(); 
+
     //struct vm_device * serial = create_serial();
     struct vm_device * generic = NULL;
-    //Zheng 09/29/2008
+
+
 
 
     if (use_ramdisk) {
       PrintDebug("Creating Ramdisk\n");
       ramdisk = create_ramdisk();
+      cdrom = v3_create_cdrom(ramdisk, config_ptr->ramdisk, config_ptr->ramdisk_size); 
     }
     
     
@@ -322,6 +342,7 @@ int config_guest(struct guest_info * info, void * config_ptr) {
 
     if (use_ramdisk) {
       v3_attach_device(info, ramdisk);
+      v3_attach_device(info, cdrom);
     }
 
     if (use_generic) {
@@ -338,16 +359,16 @@ int config_guest(struct guest_info * info, void * config_ptr) {
   
 #if 0
   // give floppy controller to vm
-  v3_hook_irq_for_guest_injection(info, 6);
+  v3_hook_passthrough_irq(info, 6);
 #endif
   
 
   if (!use_ramdisk) {
     //primary ide
-    v3_hook_irq_for_guest_injection(info, 14);
+    v3_hook_passthrough_irq(info, 14);
   
     // secondary ide
-    v3_hook_irq_for_guest_injection(info, 15);    
+    v3_hook_passthrough_irq(info, 15);    
   }  
 
   //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);