X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=70da496857224bcc2d52e12422c0939791916d9f;hb=b2d5697513a87d61e63a4317c89a0927b62b7ea1;hp=e23e64ea6ff1f9298d573974555de27a33ec59f3;hpb=a1e0475bbefa968791679c5e71232ddca522868b;p=palacios.releases.git diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c index e23e64e..70da496 100644 --- a/palacios/src/geekos/vm.c +++ b/palacios/src/geekos/vm.c @@ -10,12 +10,6 @@ - -//test decoder -//#include - -extern int parse(); - #define SPEAKER_PORT 0x61 static inline void VM_Out_Byte(ushort_t port, uchar_t value) @@ -170,7 +164,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; @@ -180,7 +174,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, @@ -192,7 +186,7 @@ int RunVMM(struct Boot_Info * bootInfo) { struct vmm_os_hooks os_hooks; struct vmm_ctrl_ops vmm_ops; - v3_guest_t* vm_info = 0; + struct guest_info * vm_info = 0; @@ -217,12 +211,6 @@ int RunVMM(struct Boot_Info * bootInfo) { Init_V3(&os_hooks, &vmm_ops); - - //test decoder - PrintBoth("testing decoder\n"); - parse(); - PrintBoth("testing decoder done\n"); - extern char _binary_vm_kernel_start; PrintBoth(" Guest Load Addr: 0x%x\n", &_binary_vm_kernel_start);