X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=169e93b08de7edc02cd87d20b6e7e2dd42b2dfc5;hb=e70e95962c26832628d586e07f9cd1a2e1852d72;hp=a46bc761336de8fb1edf322a0a354358d5ea1172;hpb=dd37e2c1fabd6d6856c7a2cdbd2f3f73fb034393;p=palacios.git diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c index a46bc76..169e93b 100644 --- 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 + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Jack Lange + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ + + + #include #include @@ -164,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; @@ -174,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, @@ -225,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);