X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=910dbd6ee8f58e700f2afea8cb7589caa4770628;hb=028d9b71d4a4e6d49a22ad5904b6dd2f8c596a26;hp=86c9ebf9aae826352a0ed629c7c6f309ca7c853f;hpb=d8fc6aa4bc2a5d9cec50923e9d2bd30f867dd50a;p=palacios.git diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c index 86c9ebf..910dbd6 100644 --- a/palacios/src/geekos/vm.c +++ b/palacios/src/geekos/vm.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -314,11 +315,17 @@ int RunVMM(struct Boot_Info * bootInfo) { hook_io_port(&(vm_info.io_map), 0x403, &IO_Read, &IO_Write_to_Serial, NULL); { + struct vm_device * nvram = create_nvram(); //struct vm_device * timer = create_timer(); struct vm_device * pic = create_pic(); //struct vm_device * keyboard = create_keyboard(); - struct vm_device * pit= create_pit(); + struct vm_device * pit = create_pit(); + + //generic_port_range_type range = {0,1024} ; // hook first 1024 ports if not already hooked + + //struct vm_device * generic = create_generic(&range,1,NULL,0,NULL,0); + attach_device(&(vm_info), nvram); //attach_device(&(vm_info), timer); @@ -326,6 +333,9 @@ int RunVMM(struct Boot_Info * bootInfo) { attach_device(&(vm_info), pit); //attach_device(&(vm_info), keyboard); + // Important that this be attached last! + //attach_device(&(vm_info), generic); + PrintDebugDevMgr(&(vm_info.dev_mgr)); }