X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fmain.c;h=e92e70d109badbcf0b7e6dae19d2181d35fae53b;hp=4da54610a04737b8e380611f018c93efe1742573;hb=b4963a8a43ca9103946f926e062e609e4498c2e2;hpb=7cb3bd8e4ed31b20163a79f2dd413ef45583dee7 diff --git a/palacios/src/geekos/main.c b/palacios/src/geekos/main.c index 4da5461..e92e70d 100644 --- a/palacios/src/geekos/main.c +++ b/palacios/src/geekos/main.c @@ -3,7 +3,7 @@ * Copyright (c) 2001,2003,2004 David H. Hovemeyer * Copyright (c) 2003, Jeffrey K. Hollingsworth * Copyright (c) 2004, Iulian Neamtiu - * $Revision: 1.13 $ + * $Revision: 1.14 $ * * This is free software. You are permitted to use, * redistribute, and modify it as specified in the file "COPYING". @@ -325,31 +325,31 @@ void Main(struct Boot_Info* bootInfo) { - struct vmm_os_hooks os_hooks; - struct vmm_ctrl_ops vmm_ops; - guest_info_t vm_info; - memset(&os_hooks, 0, sizeof(struct vmm_os_hooks)); - memset(&vmm_ops, 0, sizeof(struct vmm_ctrl_ops)); - memset(&vm_info, 0, sizeof(guest_info_t)); - - os_hooks.print_debug = &PrintBoth; - os_hooks.print_info = &Print; - os_hooks.print_trace = &SerialPrint; - os_hooks.Allocate_Pages = &Allocate_VMM_Pages; - os_hooks.Free_Page = &Free_VMM_Page; - - Init_VMM(&os_hooks, &vmm_ops); - - + struct vmm_os_hooks os_hooks; + struct vmm_ctrl_ops vmm_ops; + guest_info_t vm_info; + memset(&os_hooks, 0, sizeof(struct vmm_os_hooks)); + memset(&vmm_ops, 0, sizeof(struct vmm_ctrl_ops)); + memset(&vm_info, 0, sizeof(guest_info_t)); + + os_hooks.print_debug = &PrintBoth; + os_hooks.print_info = &Print; + os_hooks.print_trace = &SerialPrint; + os_hooks.Allocate_Pages = &Allocate_VMM_Pages; + os_hooks.Free_Page = &Free_VMM_Page; + + Init_VMM(&os_hooks, &vmm_ops); + - vm_info.rip = (ullong_t)(void*)&BuzzVM; - vm_info.rsp = (ulong_t)Alloc_Page(); - SerialPrint("Initializing Guest\n"); - (vmm_ops).init_guest(&vm_info); - SerialPrint("Starting Guest\n"); - (vmm_ops).start_guest(&vm_info); + vm_info.rip = (ullong_t)(void*)&BuzzVM; + vm_info.rsp = (ulong_t)Alloc_Page(); + SerialPrint("Initializing Guest\n"); + (vmm_ops).init_guest(&vm_info); + SerialPrint("Starting Guest\n"); + (vmm_ops).start_guest(&vm_info); + }