/* MOVE THIS TO AN INIT GUEST ROUTINE */
- init_shadow_map(&(vm_info.mem_map));
- init_shadow_page_state(&(vm_info.shdw_pg_state));
+
+
v3_init_time(&(vm_info.time_state));
- vm_info.shdw_pg_mode = SHADOW_PAGING;
+ init_shadow_map(&(vm_info.mem_map));
+
+ if ((vmm_ops).has_nested_paging()) {
+ vm_info.shdw_pg_mode = NESTED_PAGING;
+ } else {
+ init_shadow_page_state(&(vm_info.shdw_pg_state));
+ vm_info.shdw_pg_mode = SHADOW_PAGING;
+ }
vm_info.cpu_mode = REAL;
vm_info.mem_mode = PHYSICAL_MEM;
#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
- */
+#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
-
- {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
/*
- {0x3f0, 0x3f2, GENERIC_PRINT_AND_PASSTHROUGH}, // Primary floppy controller (base,statusa/statusb,DOR)
- {0x3f4, 0x3f5, GENERIC_PRINT_AND_PASSTHROUGH}, // Primary floppy controller (mainstat/datarate,data)
- {0x3f7, 0x3f7, GENERIC_PRINT_AND_PASSTHROUGH}, // Primary floppy controller (DIR)
- {0x370, 0x372, GENERIC_PRINT_AND_PASSTHROUGH}, // Secondary floppy controller (base,statusa/statusb,DOR)
- {0x374, 0x375, GENERIC_PRINT_AND_PASSTHROUGH}, // Secondary floppy controller (mainstat/datarate,data)
- {0x377, 0x377, GENERIC_PRINT_AND_PASSTHROUGH}, // Secondary floppy controller (DIR)
- {0x378, 0x400, GENERIC_PRINT_AND_PASSTHROUGH}
+ {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
*/
+ {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)
+ {0x370, 0x372, GENERIC_PRINT_AND_IGNORE}, // Secondary floppy controller (base,statusa/statusb,DOR)
+ {0x374, 0x375, GENERIC_PRINT_AND_IGNORE}, // Secondary floppy controller (mainstat/datarate,data)
+ {0x377, 0x377, GENERIC_PRINT_AND_IGNORE}, // Secondary floppy controller (DIR)
+
+ // {0x378, 0x400, GENERIC_PRINT_AND_IGNORE}
+
};
- struct vm_device * generic = create_generic(range,8, // THIS NUMBER IS CRITICAL
+ struct vm_device * generic = create_generic(range,10, // THIS NUMBER IS CRITICAL
+
NULL,0,NULL,0);
-
#endif
attach_device(&(vm_info), nvram);
// no longer needed since we have a keyboard device
//hook_irq(&vm_info, 1);
-#if 1
+#if 0
// give floppy controller to vm
hook_irq(&vm_info, 6);
-
+#endif
//primary ide
hook_irq(&vm_info, 14);
// secondary ide
hook_irq(&vm_info, 15);
-#endif
+
vm_info.rip = 0xfff0;
vm_info.vm_regs.rsp = 0x0;
