updated devices to use new host event interface

[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 027b036..3a4cbaf 100644 (file)
--- 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,28 @@
 #include <devices/nvram.h>
 #include <devices/generic.h>
 #include <devices/ramdisk.h>
+#include <devices/cdrom.h>
+
 
+#include <palacios/vmm_host_events.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];
+};
+
 
 
 
@@ -61,14 +94,17 @@ 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) {
 
-  struct guest_mem_layout * layout = (struct guest_mem_layout *)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->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;
 
 
@@ -93,6 +129,8 @@ int config_guest(struct guest_info * info, void * config_ptr) {
 
   init_emulator(info);
   
+  v3_init_host_events(info);
+
  
   //     SerialPrint("Guest Mem Dump at 0x%x\n", 0x100000);
   //PrintDebugMemDump((unsigned char *)(0x100000), 261 * 1024);
@@ -164,23 +202,26 @@ int config_guest(struct guest_info * info, void * config_ptr) {
   
   
   print_shadow_map(&(info->mem_map));
-
   
   {
     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); 
     }
     
     
@@ -307,6 +348,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) {
@@ -323,16 +365,18 @@ 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) {
+    PrintDebug("Hooking IDE IRQs\n");
+
     //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);