something that sort of works more than it did previously....

[palacios.git] / palacios / src / geekos / vm.c

diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c
index a8ef613..1005507 100644 (file)
--- a/palacios/src/geekos/vm.c
+++ b/palacios/src/geekos/vm.c
@@ -6,6 +6,7 @@
 #include <geekos/screen.h>
 #include <palacios/vmm_dev_mgr.h>
 #include <devices/nvram.h>
+#include <devices/timer.h>
 
 #define SPEAKER_PORT 0x61
 
@@ -40,30 +41,26 @@ inline uchar_t VM_In_Byte(ushort_t port)
 
 
 int IO_Read(ushort_t port, void * dst, uint_t length, void * priv_data) {
-  uchar_t * iter = dst;
-  uint_t i;
 
-  for (i = 0; i < length; i++) {
-    *iter = VM_In_Byte(port);    
-    iter++;
+  if (length != 1) {
+    return 0;
   }
-  
-  return 0;
+
+  *(uchar_t*)dst = VM_In_Byte(port);    
+  return 1;
 }
 
 
 
 int IO_Write(ushort_t port, void * src, uint_t length, void * priv_data) {
-  uchar_t * iter = src;
-  uint_t i;
 
-
-  for (i = 0; i < length; i++) {
-    VM_Out_Byte(port, *iter);    
-    iter++;
+  if (length != 1) {
+    return 0;
   }
 
-  return 0;
+  VM_Out_Byte(port, *(uchar_t *)src);    
+
+  return 1;
 }
 
 
@@ -184,9 +181,11 @@ int RunVMM(struct Boot_Info * bootInfo) {
 
     vm_info.cpu_mode = REAL;
 
+    init_irq_map(&(vm_info.irq_map));
     init_vmm_io_map(&(vm_info.io_map));
     init_interrupt_state(&(vm_info.intr_state));
 
+    dev_mgr_init(&(vm_info.dev_mgr));
     
     if (0) {
       
@@ -287,13 +286,19 @@ 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 = nvram_create();
+       struct vm_device * nvram = create_nvram();
+       //struct vm_device * timer = create_timer();
+
        attach_device(&(vm_info), nvram);
+       //attach_device(&(vm_info), timer);
        
        PrintDebugDevMgr(&(vm_info.dev_mgr));
        
+
+
       }
 
+
       vm_info.rip = 0xfff0;
       vm_info.vm_regs.rsp = 0x0;
     }
@@ -305,5 +310,4 @@ int RunVMM(struct Boot_Info * bootInfo) {
     (vmm_ops).start_guest(&vm_info);
 
     return 0;
-
 }