X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=661f5d18ef1f046cc660d4e7ead8597453dfa241;hp=6c74852c9eba5b78a9e8abd58072e02db5ddff88;hb=f7cc83b3bae64c853f5b7b63e2830b1ea92dfed9;hpb=abf911f47d91375cfbe41bee04e980aa829d26f3 diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c index 6c74852..661f5d1 100644 --- a/palacios/src/geekos/vm.c +++ b/palacios/src/geekos/vm.c @@ -18,6 +18,11 @@ #include #include +//test decoder +//#include + +extern int parse(); + #define SPEAKER_PORT 0x61 static inline void VM_Out_Byte(ushort_t port, uchar_t value) @@ -199,6 +204,8 @@ int RunVMM(struct Boot_Info * bootInfo) { + + 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)); @@ -217,7 +224,14 @@ int RunVMM(struct Boot_Info * bootInfo) { os_hooks.ack_irq = &ack_irq; os_hooks.get_cpu_khz = &get_cpu_khz; + + Init_VMM(&os_hooks, &vmm_ops); + + //test decoder + PrintBoth("testing decoder\n"); + parse(); + PrintBoth("testing decoder done\n"); /* MOVE THIS TO AN INIT GUEST ROUTINE */