X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=5fd8965c80ab84cde6f449a689900b71da15c9d6;hb=0a15dd0709348fe3770bae9cc485c1c2fc11ef98;hp=2e07e6573b3ca14585a43a03ee176be4e54a7865;hpb=d4073a9dbe24ae160b8d6bd8fd5fd4ad8aa995a3;p=palacios.git diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c index 2e07e65..5fd8965 100644 --- a/palacios/src/geekos/vm.c +++ b/palacios/src/geekos/vm.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -81,6 +82,9 @@ int IO_Read_to_Serial(ushort_t port, void * dst, uint_t length, void * priv_data char * bochs_debug_buf = NULL; int bochs_debug_offset = 0; +char * bochs_info_buf = NULL; +int bochs_info_offset = 0; + int IO_BOCHS_debug(ushort_t port, void * src, uint_t length, void * priv_data) { if (!bochs_debug_buf) { @@ -90,7 +94,7 @@ int IO_BOCHS_debug(ushort_t port, void * src, uint_t length, void * priv_data) { bochs_debug_buf[bochs_debug_offset++] = *(char*)src; if ((*(char*)src == 0xa) || (bochs_debug_offset == 1023)) { - SerialPrint("BOCHS>%s", bochs_debug_buf); + SerialPrint("BOCHSDEBUG>%s", bochs_debug_buf); memset(bochs_debug_buf, 0, 1024); bochs_debug_offset = 0; } @@ -98,6 +102,22 @@ int IO_BOCHS_debug(ushort_t port, void * src, uint_t length, void * priv_data) { return length; } +int IO_BOCHS_info(ushort_t port, void * src, uint_t length, void * priv_data) { + if (!bochs_info_buf) { + bochs_info_buf = (char*)Malloc(1024); + } + + bochs_info_buf[bochs_info_offset++] = *(char*)src; + + if ((*(char*)src == 0xa) || (bochs_info_offset == 1023)) { + SerialPrint("BOCHSINFO>%s", bochs_info_buf); + memset(bochs_info_buf, 0, 1024); + bochs_info_offset = 0; + } + + return 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); @@ -334,8 +354,8 @@ int RunVMM(struct Boot_Info * bootInfo) { 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); + hook_io_port(&(vm_info.io_map), 0x402, &IO_Read, &IO_BOCHS_info, NULL); + hook_io_port(&(vm_info.io_map), 0x403, &IO_Read, &IO_BOCHS_debug, NULL); { @@ -344,41 +364,44 @@ int RunVMM(struct Boot_Info * bootInfo) { struct vm_device * pic = create_pic(); struct vm_device * keyboard = create_keyboard(); struct vm_device * pit = create_pit(); + //struct vm_device * serial = create_serial(); #define GENERIC 1 #if GENERIC generic_port_range_type range[] = { - /* - {0x00, 0x07, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 1 channels 0,1,2,3 (address, counter) - {0xc0, 0xc7, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 2 channels 4,5,6,7 (address, counter) - {0x87, 0x87, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 1 channel 0 page register - {0x83, 0x83, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 1 channel 1 page register - {0x81, 0x81, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 1 channel 2 page register - {0x82, 0x82, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 1 channel 3 page register - {0x8f, 0x8f, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 2 channel 4 page register - {0x8b, 0x8b, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 2 channel 5 page register - {0x89, 0x89, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 2 channel 6 page register - {0x8a, 0x8a, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 2 channel 7 page register - {0x08, 0x0f, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 1 misc registers (csr, req, smask,mode,clearff,reset,enable,mmask) - {0xd0, 0xde, GENERIC_PRINT_AND_PASSTHROUGH}, // DMA 2 misc registers - */ - {0x08, 0x0f, GENERIC_PRINT_AND_IGNORE}, - {0x81, 0x8F, GENERIC_PRINT_AND_IGNORE}, - {0xd0, 0xdf, GENERIC_PRINT_AND_IGNORE}, - +#if 0 + {0x00, 0x07, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channels 0,1,2,3 (address, counter) + {0xc0, 0xc7, GENERIC_PRINT_AND_ +IGNORE}, // DMA 2 channels 4,5,6,7 (address, counter) + {0x87, 0x87, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channel 0 page register + {0x83, 0x83, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channel 1 page register + {0x81, 0x81, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channel 2 page register + {0x82, 0x82, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channel 3 page register + {0x8f, 0x8f, GENERIC_PRINT_AND_IGNORE}, // DMA 2 channel 4 page register + {0x8b, 0x8b, GENERIC_PRINT_AND_IGNORE}, // DMA 2 channel 5 page register + {0x89, 0x89, GENERIC_PRINT_AND_IGNORE}, // DMA 2 channel 6 page register + {0x8a, 0x8a, GENERIC_PRINT_AND_IGNORE}, // DMA 2 channel 7 page register + {0x08, 0x0f, GENERIC_PRINT_AND_IGNORE}, // DMA 1 misc registers (csr, req, smask,mode,clearff,reset,enable,mmask) + {0xd0, 0xde, GENERIC_PRINT_AND_IGNORE}, // DMA 2 misc registers +#endif + {0x3f8, 0x3f8+7, GENERIC_PRINT_AND_IGNORE}, // COM 1 {0x2f8, 0x2f8+7, GENERIC_PRINT_AND_IGNORE}, // COM 2 - {0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE}, // COM 2 - {0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE}, // COM 2 - /* + {0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE}, // COM 3 + {0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE}, // COM 4 + +#if 0 {0x170, 0x178, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 1 {0x376, 0x377, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 1 {0x1f0, 0x1f8, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 0 {0x3f6, 0x3f7, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 0 - */ +#endif + + +#if 0 {0x3f0, 0x3f2, GENERIC_PRINT_AND_IGNORE}, // Primary floppy controller (base,statusa/statusb,DOR) {0x3f4, 0x3f5, GENERIC_PRINT_AND_IGNORE}, // Primary floppy controller (mainstat/datarate,data) {0x3f7, 0x3f7, GENERIC_PRINT_AND_IGNORE}, // Primary floppy controller (DIR) @@ -386,14 +409,16 @@ int RunVMM(struct Boot_Info * bootInfo) { {0x374, 0x375, GENERIC_PRINT_AND_IGNORE}, // Secondary floppy controller (mainstat/datarate,data) {0x377, 0x377, GENERIC_PRINT_AND_IGNORE}, // Secondary floppy controller (DIR) +#endif + // {0x378, 0x400, GENERIC_PRINT_AND_IGNORE} + {0,0,0}, // sentinal - must be last + }; - struct vm_device * generic = create_generic(range,13, // THIS NUMBER IS CRITICAL + struct vm_device * generic = create_generic(range,NULL,NULL); - NULL,0,NULL,0); - #endif attach_device(&(vm_info), nvram); @@ -401,6 +426,7 @@ int RunVMM(struct Boot_Info * bootInfo) { attach_device(&(vm_info), pic); attach_device(&(vm_info), pit); attach_device(&(vm_info), keyboard); + // attach_device(&(vm_info), serial); #if GENERIC @@ -416,10 +442,10 @@ int RunVMM(struct Boot_Info * bootInfo) { // no longer needed since we have a keyboard device //hook_irq(&vm_info, 1); -#if 0 +#if 1 // give floppy controller to vm hook_irq(&vm_info, 6); - +#endif //primary ide hook_irq(&vm_info, 14); @@ -427,7 +453,7 @@ int RunVMM(struct Boot_Info * bootInfo) { // secondary ide hook_irq(&vm_info, 15); -#endif + vm_info.rip = 0xfff0; vm_info.vm_regs.rsp = 0x0;