added new copyright and license

[palacios.git] / palacios / src / geekos / vm.c

diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c
index e23e64e..169e93b 100644 (file)
--- a/palacios/src/geekos/vm.c
+++ b/palacios/src/geekos/vm.c
@@ -1,3 +1,24 @@
+/*
+ * 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 <geekos/vmm_stubs.h>
 
 #include <geekos/debug.h>
@@ -10,12 +31,6 @@
 
 
 
-
-//test decoder
-//#include <palacios/vmm_decoder.h>
-
-extern int parse();
-
 #define SPEAKER_PORT 0x61
 
 static inline void VM_Out_Byte(ushort_t port, uchar_t value)
@@ -170,7 +185,7 @@ void BuzzVM()
 }
 
 
-
+/*
 int passthrough_mem_read(void * guest_addr, void * dst, uint_t length, void * priv_data) {
   memcpy(dst, (void*)guest_addr, length);
   return length;
@@ -180,7 +195,7 @@ int passthrough_mem_write(void * guest_addr, void * src, uint_t length, void * p
   memcpy((void*)guest_addr, src, length);
   return length;
 }
-
+*/
 
 
 /* We need a configuration mechanism, so we can wrap this completely inside the VMM code, 
@@ -192,7 +207,7 @@ int RunVMM(struct Boot_Info * bootInfo) {
 
   struct vmm_os_hooks os_hooks;
   struct vmm_ctrl_ops vmm_ops;
-  v3_guest_t* vm_info = 0;
+  struct guest_info * vm_info = 0;
   
 
 
@@ -217,12 +232,6 @@ int RunVMM(struct Boot_Info * bootInfo) {
 
   
   Init_V3(&os_hooks, &vmm_ops);
-  
-  //test decoder
-  PrintBoth("testing decoder\n");
-  parse();
-  PrintBoth("testing decoder done\n");
-  
 
   extern char _binary_vm_kernel_start;
   PrintBoth(" Guest Load Addr: 0x%x\n", &_binary_vm_kernel_start);
@@ -237,14 +246,14 @@ int RunVMM(struct Boot_Info * bootInfo) {
 
   PrintBoth("Configured guest\n");
   
-  v3_hook_io_port(vm_info, 0x61, &IO_Read, &IO_Write, NULL);
+
   //v3_hook_io_port(&vm_info, 0x05, &IO_Read, &IO_Write_to_Serial, NULL);
   
-  
-  v3_hook_io_port(vm_info, 0x400, &IO_Read, &IO_Write_to_Serial, NULL);
-  v3_hook_io_port(vm_info, 0x401, &IO_Read, &IO_Write_to_Serial, NULL);
-  v3_hook_io_port(vm_info, 0x402, &IO_Read, &IO_BOCHS_info, NULL);
-  v3_hook_io_port(vm_info, 0x403, &IO_Read, &IO_BOCHS_debug, NULL);
+  //v3_hook_io_port(vm_info, 0x61, &IO_Read, &IO_Write, NULL);
+  //v3_hook_io_port(vm_info, 0x400, &IO_Read, &IO_Write_to_Serial, NULL);
+  //v3_hook_io_port(vm_info, 0x401, &IO_Read, &IO_Write_to_Serial, NULL);
+  //v3_hook_io_port(vm_info, 0x402, &IO_Read, &IO_BOCHS_info, NULL);
+  //v3_hook_io_port(vm_info, 0x403, &IO_Read, &IO_BOCHS_debug, NULL);
   
 
   (vmm_ops).init_guest(vm_info);