Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


added yield functionality
[palacios.git] / palacios / src / palacios / vmm_config.c
index 5114521..5bfe537 100644 (file)
@@ -1,4 +1,4 @@
-/* 
+ /* 
  * This file is part of the Palacios Virtual Machine Monitor developed
  * by the V3VEE Project with funding from the United States National 
  * Science Foundation and the Department of Energy.  
 #include <palacios/vmm_config.h>
 #include <palacios/vmm.h>
 #include <palacios/vmm_debug.h>
+#include <palacios/vmm_msr.h>
+#include <palacios/vmm_decoder.h>
+#include <palacios/vmm_profiler.h>
+#include <palacios/vmm_mem.h>
+#include <palacios/vmm_hypercall.h>
+#include <palacios/vmm_dev_mgr.h>
 
 
-#include <devices/serial.h>
-#include <devices/keyboard.h>
-#include <devices/8259a.h>
-#include <devices/8254.h>
-#include <devices/nvram.h>
 #include <devices/generic.h>
-#include <devices/ramdisk.h>
-#include <devices/cdrom.h>
-#include <devices/bochs_debug.h>
+#include <devices/ide.h>
+#include <devices/ram_cd.h>
+#include <devices/net_cd.h>
+#include <devices/ram_hd.h>
+#include <devices/net_hd.h>
 
 
 #include <palacios/vmm_host_events.h>
 #define USE_GENERIC 1
 
 
-#define ROMBIOS_START 0x000f0000
-#define VGABIOS_START 0x000c0000
-
+#include <palacios/vmm_socket.h>
 
 
+static int setup_memory_map(struct guest_info * info, struct v3_vm_config * config_ptr);
+static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr);
+static int configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr);
 
-static int mem_test_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) {
-  int foo = 20;
 
 
-  memcpy(dst, &foo, length);
 
-  PrintDebug("Passthrough mem read returning: %p (length=%d)\n", (void *)(foo + (guest_addr & 0xfff)), length);
-  return length;
-}
+static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) {
 
-static int passthrough_mem_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) {
-    memcpy(dst, (void*)guest_addr, length);
+    return length;
+    //  memcpy((void*)guest_addr, src, length);
+    PrintDebug("Write of %d bytes to %p\n", length, (void *)guest_addr);
+    PrintDebug("Write Value = %p\n", (void *)*(addr_t *)src);
+    
     return length;
 }
 
-static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) {
-  memcpy((void*)guest_addr, src, length);
-  return length;
-}
 
+int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
+   extern v3_cpu_arch_t v3_cpu_type;
 
+    // Amount of ram the Guest will have, rounded to a 4K page boundary
+    info->mem_size = config_ptr->mem_size & ~(addr_t)0xfff;
 
-int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
-  extern v3_cpu_arch_t v3_cpu_type;
 
+    // Initialize the subsystem data strutures
+    v3_init_time(info);
+    v3_init_io_map(info);
+    v3_init_msr_map(info);
+    v3_init_interrupt_state(info);
+    v3_init_exception_state(info);
+    v3_init_dev_mgr(info);
+    v3_init_host_events(info);
 
-  int use_ramdisk = config_ptr->use_ramdisk;
-  int use_generic = USE_GENERIC;
 
+    v3_init_decoder(info);
+    
+    v3_init_hypercall_map(info);
 
-  v3_init_time(info);
-  init_shadow_map(info);
-  
-  if (v3_cpu_type == V3_SVM_REV3_CPU) {
-    info->shdw_pg_mode = NESTED_PAGING;
-  } else {
-    v3_init_shadow_page_state(info);
-    info->shdw_pg_mode = SHADOW_PAGING;
-  }
-  
-  info->cpu_mode = REAL;
-  info->mem_mode = PHYSICAL_MEM;
-  
-  v3_init_vmm_io_map(info);
-  v3_init_interrupt_state(info);
-  
-  v3_init_dev_mgr(info);
 
-  v3_init_emulator(info);
-  
-  v3_init_host_events(info);
+    // Initialize the memory map
+    v3_init_shadow_map(info);
+    
+    if ((v3_cpu_type == V3_SVM_REV3_CPU) && 
+       (config_ptr->enable_nested_paging == 1)) {
+       PrintDebug("Guest Page Mode: NESTED_PAGING\n");
+       info->shdw_pg_mode = NESTED_PAGING;
+    } else {
+       PrintDebug("Guest Page Mode: SHADOW_PAGING\n");
+       v3_init_shadow_page_state(info);
+       info->shdw_pg_mode = SHADOW_PAGING;
+    }
 
+    if (config_ptr->enable_profiling) {
+       info->enable_profiler = 1;
+       v3_init_profiler(info);
+    } else {
+       info->enable_profiler = 0;
+    }
 
-  /* layout rombios */
-  {
-    uint_t num_pages = (config_ptr->rombios_size + PAGE_SIZE - 1) / PAGE_SIZE;
-    void * guest_mem =  V3_AllocPages(num_pages);
+    if (config_ptr->schedule_freq == 0) {
+       // set the schedule frequency to 100 HZ
+       config_ptr->schedule_freq = 100;
+    }
 
-    PrintDebug("Layout Region %d bytes\n", config_ptr->rombios_size);
-    memcpy(V3_VAddr(guest_mem), config_ptr->rombios, config_ptr->rombios_size);
+    PrintDebug("CPU_KHZ = %d, schedule_freq=%p\n", V3_CPU_KHZ(), (void *)config_ptr->schedule_freq);
 
-    add_shadow_region_passthrough(info, ROMBIOS_START, ROMBIOS_START + (num_pages * PAGE_SIZE), (addr_t)guest_mem);
+    info->yield_cycle_period = (V3_CPU_KHZ() * 1000) / config_ptr->schedule_freq;
     
-    PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", 
-              (void *)ROMBIOS_START, 
-              (void *)ROMBIOS_START + (num_pages * PAGE_SIZE), 
-              (void *)guest_mem);
-  }
+    // Initial CPU operating mode
+    info->cpu_mode = REAL;
+    info->mem_mode = PHYSICAL_MEM;
 
+    return 0;
+}
 
-  /* layout vgabios */
-  {
-    uint_t num_pages = (config_ptr->vgabios_size + PAGE_SIZE - 1) / PAGE_SIZE;
-    void * guest_mem =  V3_AllocPages(num_pages);
 
-    PrintDebug("Layout Region %d bytes\n", config_ptr->vgabios_size);
-    memcpy(V3_VAddr(guest_mem), config_ptr->vgabios, config_ptr->vgabios_size);
+int v3_post_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
 
-    add_shadow_region_passthrough(info, VGABIOS_START, VGABIOS_START + (num_pages * PAGE_SIZE), (addr_t)guest_mem);
+    // Configure the memory map for the guest
+    if (setup_memory_map(info, config_ptr) == -1) {
+       PrintError("Setting up guest memory map failed...\n");
+       return -1;
+    }
     
-    PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", 
-              (void *)VGABIOS_START, 
-              (void *)VGABIOS_START + (num_pages * PAGE_SIZE), 
-              (void *)guest_mem);
-  }
-
-      //     
-  add_shadow_region_passthrough(info, 0x0, 0xa0000, (addr_t)V3_AllocPages(160));
-  
-  if (1) {
-    add_shadow_region_passthrough(info, 0xa0000, 0xc0000, 0xa0000); 
-  } else {
-    hook_guest_mem(info, 0xa0000, 0xc0000, passthrough_mem_read, passthrough_mem_write, NULL);
-  }  
+    //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);
   
-  // TEMP
-  //add_shadow_region_passthrough(info, 0xc0000, 0xc8000, 0xc0000);
-  
-  if (1) {
-    add_shadow_region_passthrough(info, 0xc7000, 0xc8000, (addr_t)V3_AllocPages(1));
-    if (add_shadow_region_passthrough(info, 0xc8000, 0xf0000, (addr_t)V3_AllocPages(40)) == -1) {
-      PrintDebug("Error adding shadow region\n");
+    if (setup_devices(info, config_ptr) == -1) {
+       PrintError("Failed to setup devices\n");
+       return -1;
     }
-  } else {
-    add_shadow_region_passthrough(info, 0xc0000, 0xc8000, 0xc0000);
-    add_shadow_region_passthrough(info, 0xc8000, 0xf0000, 0xc8000);
-  }
-  
-  
-  if (1) {
-  add_shadow_region_passthrough(info, 0x100000, 0x1000000, (addr_t)V3_AllocPages(4096));
-  } else {
-    /* MEMORY HOOK TEST */
-    add_shadow_region_passthrough(info, 0x100000, 0xa00000, (addr_t)V3_AllocPages(2304));
-    hook_guest_mem(info, 0xa00000, 0xa01000, mem_test_read, passthrough_mem_write, NULL); 
-    add_shadow_region_passthrough(info, 0xa01000, 0x1000000, (addr_t)V3_AllocPages(1791));
-  }
-
-    add_shadow_region_passthrough(info, 0x1000000, 0x8000000, (addr_t)V3_AllocPages(32768));
-  // test - give linux accesss to PCI space - PAD
-  add_shadow_region_passthrough(info, 0xc0000000,0xffffffff,0xc0000000);
-  
-  
-  print_shadow_map(&(info->mem_map));
-  
-  {
-    struct vm_device * ramdisk = NULL;
-    struct vm_device * cdrom = NULL;
-    struct vm_device * nvram = v3_create_nvram();
-    //struct vm_device * timer = v3_create_timer();
-    struct vm_device * pic = v3_create_pic();
-    struct vm_device * keyboard = v3_create_keyboard();
-    struct vm_device * pit = v3_create_pit(); 
-    struct vm_device * bochs_debug = v3_create_bochs_debug();
 
-    //struct vm_device * serial = v3_create_serial();
-    struct vm_device * generic = NULL;
+    info->run_state = VM_STOPPED;
+
+    info->vm_regs.rdi = 0;
+    info->vm_regs.rsi = 0;
+    info->vm_regs.rbp = 0;
+    info->vm_regs.rsp = 0;
+    info->vm_regs.rbx = 0;
+    info->vm_regs.rdx = 0;
+    info->vm_regs.rcx = 0;
+    info->vm_regs.rax = 0;
+
+    return 0;
+}
+
 
 
 
 
-    if (use_ramdisk) {
-      PrintDebug("Creating Ramdisk\n");
-      ramdisk = v3_create_ramdisk();
-      cdrom = v3_create_cdrom(ramdisk, config_ptr->ramdisk, config_ptr->ramdisk_size); 
+/* TODO:
+ * The amount of guest memory is stored in info->mem_size
+ * We need to make sure the memory map extends to cover it
+ */
+static int setup_memory_map(struct guest_info * info, struct v3_vm_config * config_ptr) {
+    PrintDebug("Setting up memory map (memory size=%dMB)\n", (uint_t)(info->mem_size / (1024 * 1024)));
+    
+    // VGA frame buffer
+    if (1) {
+       if (v3_add_shadow_mem(info, 0xa0000, 0xc0000, 0xa0000) == -1) {
+           PrintError("Could not map VGA framebuffer\n");
+           return -1;
+       }
+    } else {
+       v3_hook_write_mem(info, 0xa0000, 0xc0000, 0xa0000,  passthrough_mem_write, NULL);
+    }
+
+#define VGABIOS_START 0x000c0000
+#define ROMBIOS_START 0x000f0000
+
+    /* layout vgabios */
+    {
+       addr_t vgabios_dst = v3_get_shadow_addr(&(info->mem_map.base_region), VGABIOS_START);
+       memcpy(V3_VAddr((void *)vgabios_dst), config_ptr->vgabios, config_ptr->vgabios_size);   
     }
     
+    /* layout rombios */
+    {
+       addr_t rombios_dst = v3_get_shadow_addr(&(info->mem_map.base_region), ROMBIOS_START);
+       memcpy(V3_VAddr((void *)rombios_dst), config_ptr->rombios, config_ptr->rombios_size);
+    }
+
+#ifdef CRAY_XT
+    {
+#define SEASTAR_START 0xffe00000 
+#define SEASTAR_END 0xffffffff 
+       // Map the Seastar straight through
+       if (v3_add_shadow_mem(info, SEASTAR_START, SEASTAR_END, SEASTAR_START) == -1) {
+           PrintError("Could not map through the seastar\n");
+           return -1;
+       }
+    }
+#endif
+
+    print_shadow_map(info);
+
+    return 0;
+}
+
+
+
+static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) {
+
+    v3_create_device(info, "8259A", NULL);
+    v3_create_device(info, "KEYBOARD", NULL);
+    v3_create_device(info, "8254_PIT", NULL); 
+    v3_create_device(info, "BOCHS_DEBUG", NULL);
+    v3_create_device(info, "OS_DEBUG", NULL);
+    v3_create_device(info, "LAPIC", NULL);
+    v3_create_device(info, "IOAPIC", "LAPIC");
+    v3_create_device(info, "VMNET", NULL);
     
+    int use_generic = USE_GENERIC;
+
+    if (config_ptr->enable_pci == 1) {
+       struct ide_cfg ide_config = {"PCI", "PIIX3"};
+       
+       v3_create_device(info, "PCI", NULL);
+       v3_create_device(info, "i440FX", "PCI");
+       v3_create_device(info, "PIIX3", "PCI");
+       
+
+       v3_create_device(info, "LNX_VIRTIO_BLK", "PCI");
+       v3_create_device(info, "LNX_VIRTIO_BALLOON", "PCI");
+       v3_create_device(info, "SYM_SWAP", "LNX_VIRTIO_BLK");
+
+       v3_create_device(info, "IDE", &ide_config);
+    } else {
+       v3_create_device(info, "IDE", NULL);
+    }
+
+
+    if (config_ptr->pri_disk_type != NONE) {
+       if (config_ptr->pri_disk_type == CDROM) {
+           if (config_ptr->pri_disk_con == RAM) {
+               struct ram_cd_cfg cfg = {"IDE", 0, 0, 
+                                        (addr_t)(config_ptr->pri_disk_info.ram.data_ptr), 
+                                        config_ptr->pri_disk_info.ram.size};
+
+               PrintDebug("Creating RAM CD\n");
+
+               v3_create_device(info, "RAM-CD", &cfg);
+           } else if (config_ptr->pri_disk_con == NETWORK) {
+               struct net_cd_cfg cfg = {"IDE", 0, 0, 
+                                        config_ptr->pri_disk_info.net.ip_str,
+                                        config_ptr->pri_disk_info.net.port, 
+                                        config_ptr->pri_disk_info.net.disk_name};
+               PrintDebug("Creating NET CD\n");
+
+               v3_create_device(info, "NET-CD", &cfg);
+           }
+       } else if (config_ptr->pri_disk_type == HARDDRIVE) {
+           if (config_ptr->pri_disk_con == RAM) {
+               struct ram_hd_cfg cfg = {"IDE", 0, 0, 
+                                        (addr_t)(config_ptr->pri_disk_info.ram.data_ptr), 
+                                        config_ptr->pri_disk_info.ram.size};
+
+               PrintDebug("Creating RAM HD\n");
+
+               v3_create_device(info, "RAM-HD", &cfg);
+           } else if (config_ptr->pri_disk_con == NETWORK) {
+               struct net_hd_cfg cfg  = {"IDE", 0, 0, 
+                                         config_ptr->pri_disk_info.net.ip_str,
+                                         config_ptr->pri_disk_info.net.port, 
+                                         config_ptr->pri_disk_info.net.disk_name};
+               PrintDebug("Creating NET HD\n");
+               v3_create_device(info, "NET-HD", &cfg);
+           }
+       }
+    }
+
+
+
+    if (config_ptr->sec_disk_type != NONE) {
+       if (config_ptr->sec_disk_type == CDROM) {
+           if (config_ptr->sec_disk_con == RAM) {
+               struct ram_cd_cfg cfg = {"IDE", 0, 1, 
+                                        (addr_t)(config_ptr->sec_disk_info.ram.data_ptr), 
+                                        config_ptr->sec_disk_info.ram.size};
+
+               PrintDebug("Creating RAM CD\n");
+               v3_create_device(info, "RAM-CD", &cfg);
+           } else if (config_ptr->sec_disk_con == NETWORK) {
+               struct net_cd_cfg cfg = {"IDE", 0, 1, 
+                                        config_ptr->sec_disk_info.net.ip_str,
+                                        config_ptr->sec_disk_info.net.port, 
+                                        config_ptr->sec_disk_info.net.disk_name};
+
+               PrintDebug("Creating NET CD\n");
+               v3_create_device(info, "NET-CD", &cfg);    
+           }
+       } else if (config_ptr->sec_disk_type == HARDDRIVE) {
+           if (config_ptr->sec_disk_con == RAM) {
+               struct ram_hd_cfg cfg = {"IDE", 0, 1, 
+                                        (addr_t)(config_ptr->sec_disk_info.ram.data_ptr), 
+                                        config_ptr->sec_disk_info.ram.size};
+               PrintDebug("Creating RAM HD\n");
+               v3_create_device(info, "RAM-HD", &cfg);
+           } else if (config_ptr->sec_disk_con == NETWORK) {
+               struct net_hd_cfg cfg = {"IDE", 0, 1, 
+                                        config_ptr->sec_disk_info.net.ip_str,
+                                        config_ptr->sec_disk_info.net.port, 
+                                        config_ptr->sec_disk_info.net.disk_name};
+               PrintDebug("Creating NET HD\n");
+               v3_create_device(info, "NET-HD", &cfg);
+           }
+       }
+    }
+
+
+
     if (use_generic) {
-      PrintDebug("Creating Generic Device\n");
-      generic = v3_create_generic();
-      
-      // Make the DMA controller invisible
-      v3_generic_add_port_range(generic, 0x00, 0x07, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channels 0,1,2,3 (address, counter)
-      v3_generic_add_port_range(generic, 0xc0, 0xc7, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channels 4,5,6,7 (address, counter)
-      v3_generic_add_port_range(generic, 0x87, 0x87, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channel 0 page register
-      v3_generic_add_port_range(generic, 0x83, 0x83, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channel 1 page register
-      v3_generic_add_port_range(generic, 0x81, 0x81, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channel 2 page register
-      v3_generic_add_port_range(generic, 0x82, 0x82, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channel 3 page register
-      v3_generic_add_port_range(generic, 0x8f, 0x8f, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channel 4 page register
-      v3_generic_add_port_range(generic, 0x8b, 0x8b, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channel 5 page register
-      v3_generic_add_port_range(generic, 0x89, 0x89, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channel 6 page register
-      v3_generic_add_port_range(generic, 0x8a, 0x8a, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channel 7 page register
-      v3_generic_add_port_range(generic, 0x08, 0x0f, GENERIC_PRINT_AND_IGNORE);   // DMA 1 misc registers (csr, req, smask,mode,clearff,reset,enable,mmask)
-      v3_generic_add_port_range(generic, 0xd0, 0xde, GENERIC_PRINT_AND_IGNORE);   // DMA 2 misc registers
-      
-      
-      
-      
-      // Make the Serial ports invisible 
-      
-      v3_generic_add_port_range(generic, 0x3f8, 0x3f8+7, GENERIC_PRINT_AND_IGNORE);      // COM 1
-      v3_generic_add_port_range(generic, 0x2f8, 0x2f8+7, GENERIC_PRINT_AND_IGNORE);      // COM 2
-      
+       configure_generic(info, config_ptr);
+    }
 
-      
+    // This should go last because it requires information about the Harddrives
+    v3_create_device(info, "NVRAM", "IDE");
+    
+    PrintDebugDevMgr(info);
 
-      v3_generic_add_port_range(generic, 0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE);      // COM 3
-      v3_generic_add_port_range(generic, 0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE);      // COM 4
+    return 0;
+}
 
-      
-      
 
-      // Make the PCI bus invisible (at least it's configuration)
+
+
+static int configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr) {
+    PrintDebug("Creating Generic Device\n");
+    v3_create_device(info, "GENERIC", NULL);
+    
+
+    struct vm_device * generic = v3_find_dev(info, "GENERIC");
+
+    if (!generic) {
+       PrintError("Could not find generic device\n");
+       return -1;
+    }
+
+    // port 0x92: A20 enable/disable (bit 2) (This causes an MMU flush)
+
+
+    // Make the DMA controller invisible
+    v3_generic_add_port_range(generic, 0x00, 0x07, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channels 0,1,2,3 (address, counter)
+    v3_generic_add_port_range(generic, 0xc0, 0xc7, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channels 4,5,6,7 (address, counter)
+    v3_generic_add_port_range(generic, 0x87, 0x87, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channel 0 page register
+    v3_generic_add_port_range(generic, 0x83, 0x83, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channel 1 page register
+    v3_generic_add_port_range(generic, 0x81, 0x81, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channel 2 page register
+    v3_generic_add_port_range(generic, 0x82, 0x82, GENERIC_PRINT_AND_IGNORE);   // DMA 1 channel 3 page register
+    v3_generic_add_port_range(generic, 0x8f, 0x8f, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channel 4 page register
+    v3_generic_add_port_range(generic, 0x8b, 0x8b, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channel 5 page register
+    v3_generic_add_port_range(generic, 0x89, 0x89, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channel 6 page register
+    v3_generic_add_port_range(generic, 0x8a, 0x8a, GENERIC_PRINT_AND_IGNORE);   // DMA 2 channel 7 page register
+    v3_generic_add_port_range(generic, 0x08, 0x0f, GENERIC_PRINT_AND_IGNORE);   // DMA 1 misc registers (csr, req, smask,mode,clearff,reset,enable,mmask)
+    v3_generic_add_port_range(generic, 0xd0, 0xde, GENERIC_PRINT_AND_IGNORE);   // DMA 2 misc registers
+    
+    
+    
+    
+    // Make the Serial ports invisible 
+    
+    v3_generic_add_port_range(generic, 0x3f8, 0x3f8+7, GENERIC_PRINT_AND_IGNORE);      // COM 1
+    v3_generic_add_port_range(generic, 0x2f8, 0x2f8+7, GENERIC_PRINT_AND_IGNORE);      // COM 2
+    
+
       
-      v3_generic_add_port_range(generic, 0xcf8, 0xcf8, GENERIC_PRINT_AND_IGNORE); // PCI Config Address
-      v3_generic_add_port_range(generic, 0xcfc, 0xcfc, GENERIC_PRINT_AND_IGNORE); // PCI Config Data
+
+    v3_generic_add_port_range(generic, 0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE);      // COM 3
+    v3_generic_add_port_range(generic, 0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE);      // COM 4
 
       
       
+
+    // Make the PCI bus invisible (at least it's configuration)
+    
+    //v3_generic_add_port_range(generic, 0xcf8, 0xcf8, GENERIC_PRINT_AND_IGNORE); // PCI Config Address
+    //v3_generic_add_port_range(generic, 0xcfc, 0xcfc, GENERIC_PRINT_AND_IGNORE); // PCI Config Data
+    
+    
+    
 #if 0
-      if (!use_ramdisk) {
+    if (!use_ramdisk) {
        // Monitor the IDE controllers (very slow)
        v3_generic_add_port_range(generic, 0x170, 0x178, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 1
        v3_generic_add_port_range(generic, 0x376, 0x377, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 1
-      }
+    }
       
 
-      v3_generic_add_port_range(generic, 0x1f0, 0x1f8, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 0
-      v3_generic_add_port_range(generic, 0x3f6, 0x3f7, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 0
+    v3_generic_add_port_range(generic, 0x1f0, 0x1f8, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 0
+    v3_generic_add_port_range(generic, 0x3f6, 0x3f7, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 0
 #endif
       
       
 #if 0
-      
-      // Make the floppy controllers invisible
-      
-      v3_generic_add_port_range(generic, 0x3f0, 0x3f2, GENERIC_PRINT_AND_IGNORE); // Primary floppy controller (base,statusa/statusb,DOR)
-      v3_generic_add_port_range(generic, 0x3f4, 0x3f5, GENERIC_PRINT_AND_IGNORE); // Primary floppy controller (mainstat/datarate,data)
-      v3_generic_add_port_range(generic, 0x3f7, 0x3f7, GENERIC_PRINT_AND_IGNORE); // Primary floppy controller (DIR)
-      v3_generic_add_port_range(generic, 0x370, 0x372, GENERIC_PRINT_AND_IGNORE); // Secondary floppy controller (base,statusa/statusb,DOR)
-      v3_generic_add_port_range(generic, 0x374, 0x375, GENERIC_PRINT_AND_IGNORE); // Secondary floppy controller (mainstat/datarate,data)
-      v3_generic_add_port_range(generic, 0x377, 0x377, GENERIC_PRINT_AND_IGNORE); // Secondary floppy controller (DIR)
-      
+    
+    // Make the floppy controllers invisible
+    
+    v3_generic_add_port_range(generic, 0x3f0, 0x3f2, GENERIC_PRINT_AND_IGNORE); // Primary floppy controller (base,statusa/statusb,DOR)
+    v3_generic_add_port_range(generic, 0x3f4, 0x3f5, GENERIC_PRINT_AND_IGNORE); // Primary floppy controller (mainstat/datarate,data)
+    v3_generic_add_port_range(generic, 0x3f7, 0x3f7, GENERIC_PRINT_AND_IGNORE); // Primary floppy controller (DIR)
+    v3_generic_add_port_range(generic, 0x370, 0x372, GENERIC_PRINT_AND_IGNORE); // Secondary floppy controller (base,statusa/statusb,DOR)
+    v3_generic_add_port_range(generic, 0x374, 0x375, GENERIC_PRINT_AND_IGNORE); // Secondary floppy controller (mainstat/datarate,data)
+    v3_generic_add_port_range(generic, 0x377, 0x377, GENERIC_PRINT_AND_IGNORE); // Secondary floppy controller (DIR)
+    
 #endif
 
 #if 1
 
-      // Make the parallel port invisible
+    // Make the parallel port invisible
       
-      v3_generic_add_port_range(generic, 0x378, 0x37f, GENERIC_PRINT_AND_IGNORE);
+    v3_generic_add_port_range(generic, 0x378, 0x37f, GENERIC_PRINT_AND_IGNORE);
 
 #endif
 
 #if 1
 
-      // Monitor graphics card operations
-
-      v3_generic_add_port_range(generic, 0x3b0, 0x3bb, GENERIC_PRINT_AND_PASSTHROUGH);
-      v3_generic_add_port_range(generic, 0x3c0, 0x3df, GENERIC_PRINT_AND_PASSTHROUGH);
+    // Monitor graphics card operations
+    
+    v3_generic_add_port_range(generic, 0x3b0, 0x3bb, GENERIC_PRINT_AND_PASSTHROUGH);
+    v3_generic_add_port_range(generic, 0x3c0, 0x3df, GENERIC_PRINT_AND_PASSTHROUGH);
       
 #endif
 
 
 #if 1
-      // Make the ISA PNP features invisible
-
-      v3_generic_add_port_range(generic, 0x274, 0x277, GENERIC_PRINT_AND_IGNORE);
-      v3_generic_add_port_range(generic, 0x279, 0x279, GENERIC_PRINT_AND_IGNORE);
-      v3_generic_add_port_range(generic, 0xa79, 0xa79, GENERIC_PRINT_AND_IGNORE);
+    // Make the ISA PNP features invisible
+    
+    v3_generic_add_port_range(generic, 0x274, 0x277, GENERIC_PRINT_AND_IGNORE);
+    v3_generic_add_port_range(generic, 0x279, 0x279, GENERIC_PRINT_AND_IGNORE);
+    v3_generic_add_port_range(generic, 0xa79, 0xa79, GENERIC_PRINT_AND_IGNORE);
 #endif
 
 
 #if 1
-      // Monitor any network card (realtek ne2000) operations 
-      v3_generic_add_port_range(generic, 0xc100, 0xc1ff, GENERIC_PRINT_AND_PASSTHROUGH);
+    // Monitor any network card (realtek ne2000) operations 
+    v3_generic_add_port_range(generic, 0xc100, 0xc1ff, GENERIC_PRINT_AND_PASSTHROUGH);
 #endif
 
-
-#if 1
-      // Make any Bus master ide controller invisible
-      
-      v3_generic_add_port_range(generic, 0xc000, 0xc00f, GENERIC_PRINT_AND_IGNORE);
-#endif
-      
-    }
-      //  v3_generic_add_port_range(generic, 0x378, 0x400, GENERIC_PRINT_AND_IGNORE);
-      
-
-
+    //  v3_generic_add_port_range(generic, 0x378, 0x400, GENERIC_PRINT_AND_IGNORE);
     
-
-    v3_attach_device(info, nvram);
-    //v3_attach_device(info, timer);
-    v3_attach_device(info, pic);
-    v3_attach_device(info, pit);
-    v3_attach_device(info, keyboard);
-    // v3_attach_device(info, serial);
-    v3_attach_device(info, bochs_debug);
-
-    if (use_ramdisk) {
-      v3_attach_device(info, ramdisk);
-      v3_attach_device(info, cdrom);
-    }
-
-    if (use_generic) {
-      // Important that this be attached last!
-      v3_attach_device(info, generic);
-    }
-    
-    PrintDebugDevMgr(info);
-  }
-  
-  // give keyboard interrupts to vm
-  // no longer needed since we have a keyboard device
-  //hook_irq(&vm_info, 1);
-  
-#if 0
-  // give floppy controller to vm
-  v3_hook_passthrough_irq(info, 6);
-#endif
-  
-
-  if (!use_ramdisk) {
-    PrintDebug("Hooking IDE IRQs\n");
-
-    //primary ide
-    v3_hook_passthrough_irq(info, 14);
-  
-    // secondary ide
-    v3_hook_passthrough_irq(info, 15);    
-  }  
-
-  //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);
-
-  info->rip = 0xfff0;
-  info->vm_regs.rsp = 0x0;
-  
-
-  return 0;
+    return 0;
 }