X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=300ac56202371fe62282ee8a26b5897e613afa09;hb=624a05de781c51ed5d34a6db2583f884918a9594;hp=b1149fbc639c1650090066499ff3bc7aeb365de6;hpb=40be15894eccfbb51e42bcfe550aaf8d9841bc3a;p=palacios.git diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c index b1149fb..300ac56 100644 --- a/palacios/src/geekos/vm.c +++ b/palacios/src/geekos/vm.c @@ -4,6 +4,13 @@ #include #include #include +#include +#include +#include +#include +#include +#include + #define SPEAKER_PORT 0x61 @@ -37,35 +44,31 @@ inline uchar_t VM_In_Byte(ushort_t port) -int IO_Read(ushort_t port, void * dst, uint_t length) { - uchar_t * iter = dst; - uint_t i; +int IO_Read(ushort_t port, void * dst, uint_t length, void * priv_data) { - for (i = 0; i < length; i++) { - *iter = VM_In_Byte(port); - iter++; + if (length != 1) { + return 0; } - - return 0; -} + *(uchar_t*)dst = VM_In_Byte(port); + return 1; +} -int IO_Write(ushort_t port, void * src, uint_t length) { - uchar_t * iter = src; - uint_t i; +int IO_Write(ushort_t port, void * src, uint_t length, void * priv_data) { - for (i = 0; i < length; i++) { - VM_Out_Byte(port, *iter); - iter++; + if (length != 1) { + return 0; } - return 0; + VM_Out_Byte(port, *(uchar_t *)src); + + return 1; } -int IO_Read_to_Serial(ushort_t port, void * dst, uint_t length) { +int IO_Read_to_Serial(ushort_t port, void * dst, uint_t length, void * priv_data) { PrintBoth("Input from Guest on port %d (0x%x) Length=%d\n", port, port, length); return 0; @@ -76,14 +79,14 @@ char * bochs_debug_buf = NULL; int bochs_debug_offset = 0; -int IO_BOCHS_debug(ushort_t port, void * src, uint_t length) { +int IO_BOCHS_debug(ushort_t port, void * src, uint_t length, void * priv_data) { if (!bochs_debug_buf) { bochs_debug_buf = (char*)Malloc(1024); } bochs_debug_buf[bochs_debug_offset++] = *(char*)src; - if ((*(char*)src == '\n') || (bochs_debug_offset == 1023)) { + if ((*(char*)src == 0xa) || (bochs_debug_offset == 1023)) { SerialPrint("BOCHS>%s", bochs_debug_buf); memset(bochs_debug_buf, 0, 1024); bochs_debug_offset = 0; @@ -93,7 +96,7 @@ int IO_BOCHS_debug(ushort_t port, void * src, uint_t length) { } -int IO_Write_to_Serial(ushort_t port, void * src, uint_t length) { +int IO_Write_to_Serial(ushort_t port, void * src, uint_t length, void * priv_data) { SerialPrint("Output from Guest on port %d (0x%x) Length=%d\n", port, port, length); switch (length) { @@ -158,6 +161,8 @@ int RunVMM(struct Boot_Info * bootInfo) { addr_t rsp; addr_t rip; + + memset(&os_hooks, 0, sizeof(struct vmm_os_hooks)); memset(&vmm_ops, 0, sizeof(struct vmm_ctrl_ops)); memset(&vm_info, 0, sizeof(struct guest_info)); @@ -171,8 +176,9 @@ int RunVMM(struct Boot_Info * bootInfo) { os_hooks.free = &VMM_Free; os_hooks.vaddr_to_paddr = &Identity; os_hooks.paddr_to_vaddr = &Identity; - - + os_hooks.hook_interrupt = &hook_irq_stub; + os_hooks.ack_irq = &ack_irq; + // DumpGDT(); Init_VMM(&os_hooks, &vmm_ops); @@ -182,8 +188,11 @@ int RunVMM(struct Boot_Info * bootInfo) { vm_info.cpu_mode = REAL; + //init_irq_map(&(vm_info.irq_map)); init_vmm_io_map(&(vm_info.io_map)); + init_interrupt_state(&vm_info); + dev_mgr_init(&(vm_info.dev_mgr)); if (0) { @@ -213,8 +222,8 @@ int RunVMM(struct Boot_Info * bootInfo) { add_shadow_region_passthrough(&vm_info, 0x0, 0x100000, 0x100000); - hook_io_port(&(vm_info.io_map), 0x61, &IO_Read, &IO_Write); - hook_io_port(&(vm_info.io_map), 0x05, &IO_Read, &IO_Write_to_Serial); + hook_io_port(&(vm_info.io_map), 0x61, &IO_Read, &IO_Write, NULL); + hook_io_port(&(vm_info.io_map), 0x05, &IO_Read, &IO_Write_to_Serial, NULL); /* vm_info.cr0 = 0; @@ -261,26 +270,53 @@ int RunVMM(struct Boot_Info * bootInfo) { region_start += reg->length; } + // add_shadow_region_passthrough(&vm_info, 0x0, 0xa0000, (addr_t)Allocate_VMM_Pages(160)); add_shadow_region_passthrough(&vm_info, 0xa0000, 0xc0000, 0xa0000); - if (add_shadow_region_passthrough(&vm_info, 0xc7000, 0xf0000, (addr_t)Allocate_VMM_Pages(41)) == -1) { - PrintDebug("Error adding shadow region\n"); + + + if (1) { + add_shadow_region_passthrough(&vm_info, 0xc7000, 0xc8000, (addr_t)Allocate_VMM_Pages(1)); + if (add_shadow_region_passthrough(&vm_info, 0xc8000, 0xf0000, (addr_t)Allocate_VMM_Pages(40)) == -1) { + PrintDebug("Error adding shadow region\n"); + } + } else { + add_shadow_region_passthrough(&vm_info, 0xc0000, 0xc8000, 0xc0000); + add_shadow_region_passthrough(&vm_info, 0xc8000, 0xf0000, 0xc8000); } + print_shadow_map(&(vm_info.mem_map)); - hook_io_port(&(vm_info.io_map), 0x61, &IO_Read, &IO_Write); - hook_io_port(&(vm_info.io_map), 0x05, &IO_Read, &IO_Write_to_Serial); + hook_io_port(&(vm_info.io_map), 0x61, &IO_Read, &IO_Write, NULL); + hook_io_port(&(vm_info.io_map), 0x05, &IO_Read, &IO_Write_to_Serial, NULL); + + /* + hook_io_port(&(vm_info.io_map), 0x20, &IO_Read, &IO_Write_to_Serial, NULL); + hook_io_port(&(vm_info.io_map), 0x21, &IO_Read, &IO_Write_to_Serial, NULL); + hook_io_port(&(vm_info.io_map), 0xa0, &IO_Read, &IO_Write_to_Serial, NULL); + hook_io_port(&(vm_info.io_map), 0xa1, &IO_Read, &IO_Write_to_Serial, NULL); + */ + hook_io_port(&(vm_info.io_map), 0x400, &IO_Read, &IO_Write_to_Serial, NULL); + hook_io_port(&(vm_info.io_map), 0x401, &IO_Read, &IO_Write_to_Serial, NULL); + hook_io_port(&(vm_info.io_map), 0x402, &IO_Read, &IO_BOCHS_debug, NULL); + hook_io_port(&(vm_info.io_map), 0x403, &IO_Read, &IO_Write_to_Serial, NULL); + + { + struct vm_device * nvram = create_nvram(); + //struct vm_device * timer = create_timer(); + struct vm_device * pic = create_pic(); - hook_io_port(&(vm_info.io_map), 0x20, &IO_Read, &IO_Write_to_Serial); - hook_io_port(&(vm_info.io_map), 0x21, &IO_Read, &IO_Write_to_Serial); - hook_io_port(&(vm_info.io_map), 0xa0, &IO_Read, &IO_Write_to_Serial); - hook_io_port(&(vm_info.io_map), 0xa1, &IO_Read, &IO_Write_to_Serial); + attach_device(&(vm_info), nvram); + //attach_device(&(vm_info), timer); + attach_device(&(vm_info), pic); - hook_io_port(&(vm_info.io_map), 0x400, &IO_Read, &IO_Write_to_Serial); - hook_io_port(&(vm_info.io_map), 0x401, &IO_Read, &IO_Write_to_Serial); - hook_io_port(&(vm_info.io_map), 0x402, &IO_Read, &IO_BOCHS_debug); - hook_io_port(&(vm_info.io_map), 0x403, &IO_Read, &IO_Write_to_Serial); + PrintDebugDevMgr(&(vm_info.dev_mgr)); + } + + hook_irq(&vm_info, 6); + hook_irq(&vm_info, 14); + hook_irq(&vm_info, 15); vm_info.rip = 0xfff0; vm_info.vm_regs.rsp = 0x0; @@ -289,9 +325,8 @@ int RunVMM(struct Boot_Info * bootInfo) { PrintBoth("Initializing Guest (eip=0x%.8x) (esp=0x%.8x)\n", (uint_t)vm_info.rip,(uint_t)vm_info.vm_regs.rsp); (vmm_ops).init_guest(&vm_info); PrintBoth("Starting Guest\n"); - Clear_Screen(); + //Clear_Screen(); (vmm_ops).start_guest(&vm_info); return 0; - }