X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=16bcb177f48da1281945e5addcefe4b254bdd6f0;hb=452885dcf15a56694ba283a079877ac38b545b0f;hp=1dc59968e6692af428d51da01bb68a60becf0f79;hpb=f4b430cdef58c5d13260c57f46a077c07c72864e;p=palacios.releases.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 1dc5996..16bcb17 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -1,6 +1,21 @@
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
-/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
-
+/* 
+ * 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.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
 
 #include <palacios/vmm_config.h>
 #include <palacios/vmm.h>
@@ -14,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 0
+
+#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];
+};
+
 
 
 
@@ -61,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;
 
 
@@ -168,21 +199,28 @@ 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); 
     }
     
     
     if (use_generic) {
+      PrintDebug("Creating Generic Device\n");
       generic = create_generic();
       
       // Make the DMA controller invisible
@@ -209,11 +247,10 @@ int config_guest(struct guest_info * info, void * config_ptr) {
       
 
       
-#ifndef DEBUG_RAMDISK
-      
+
       v3_generic_add_port_range(generic, 0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE);      // COM 3
       v3_generic_add_port_range(generic, 0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE);      // COM 4
-#endif
+
       
       
 
@@ -224,13 +261,14 @@ int config_guest(struct guest_info * info, void * config_ptr) {
 
       
       
+#if 0
       if (!use_ramdisk) {
 	// Monitor the IDE controllers (very slow)
 	v3_generic_add_port_range(generic, 0x170, 0x178, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 1
 	v3_generic_add_port_range(generic, 0x376, 0x377, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 1
       }
       
-#if 1
+
       v3_generic_add_port_range(generic, 0x1f0, 0x1f8, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 0
       v3_generic_add_port_range(generic, 0x3f6, 0x3f7, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 0
 #endif
@@ -304,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) {