X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=6ceda0a4724c623dc329d03b66259827201b3dce;hb=09149700a57ced21de742451c9302320ca4eebc2;hp=75714c43e5da30640e4c7b38eba75390e0a7ad39;hpb=881733821ac0efab7d80485e86eb6bbb0e92e59e;p=palacios.git diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c index 75714c4..6ceda0a 100644 --- a/palacios/src/geekos/vm.c +++ b/palacios/src/geekos/vm.c @@ -176,7 +176,8 @@ 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); @@ -269,11 +270,19 @@ int RunVMM(struct Boot_Info * bootInfo) { region_start += reg->length; } - add_shadow_region_passthrough(&vm_info, 0xc0000, 0xc8000, 0xc0000); + // 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, 0xc8000, 0xf0000, (addr_t)Allocate_VMM_Pages(40)) == -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); }