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.


Add lock to vmm_queue
[palacios.git] / palacios / src / palacios / vmm_config.c
index 44dbd50..81a37d3 100644 (file)
 #include <palacios/vmm_mem.h>
 #include <palacios/vmm_hypercall.h>
 #include <palacios/vmm_dev_mgr.h>
-#include <palacios/vmm_sym_iface.h>
 #include <palacios/vmm_cpuid.h>
+#include <palacios/vmm_xml.h>
+
+#include <palacios/svm.h>
+#include <palacios/vmx.h>
+
+#ifdef CONFIG_SYMBIOTIC
+#include <palacios/vmm_sym_iface.h>
 
 #ifdef CONFIG_SYMBIOTIC_SWAP
 #include <palacios/vmm_sym_swap.h>
 #endif
 
-#include <devices/generic.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>
+#endif
 
-#include <devices/telnet_cons.h>
-#include <devices/pci_passthrough.h>
 
+#include <palacios/vmm_host_events.h>
+#include <palacios/vmm_socket.h>
 
+#include "vmm_config_class.h"
 
+// This is used to access the configuration file index table
+struct file_hdr {
+    uint32_t index;
+    uint32_t size;
+    uint64_t offset;
+};
 
-#include <palacios/vmm_host_events.h>
+struct file_idx_table {
+    uint64_t num_files;
+    struct file_hdr hdrs[0];
+};
 
 
 
-#include <palacios/vmm_socket.h>
+
+static int setup_memory_map(struct guest_info * info, struct v3_config * config_ptr);
+static int setup_devices(struct guest_info * info, struct v3_config * config_ptr);
+
+
+char * v3_cfg_val(v3_cfg_tree_t * tree, char * tag) {
+    char * attrib = (char *)v3_xml_attr(tree, tag);
+    v3_cfg_tree_t * child_entry = v3_xml_child(tree, tag);
+    char * val = NULL;
+
+    if ((child_entry != NULL) && (attrib != NULL)) {
+       PrintError("Duplicate Configuration parameters present for %s\n", tag);
+       return NULL;
+    }
+
+    val = (attrib == NULL) ? v3_xml_txt(child_entry): attrib;
+
+    return val; 
+}
+
+v3_cfg_tree_t * v3_cfg_subtree(v3_cfg_tree_t * tree, char * tag) {
+    return v3_xml_child(tree, tag);
+}
+
+v3_cfg_tree_t * v3_cfg_next_branch(v3_cfg_tree_t * tree) {
+    return v3_xml_next(tree);
+}
 
 
-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);
 
+struct v3_cfg_file * v3_cfg_get_file(struct guest_info * info, char * tag) {
+    struct v3_cfg_file * file = NULL;
 
+    file = (struct v3_cfg_file *)v3_htable_search(info->cfg_data->file_table, (addr_t)tag);
 
-#ifdef CONFIG_PASSTHROUGH_VIDEO
-static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) {
+    return file;
+}
+
+
+static uint_t file_hash_fn(addr_t key) {
+    char * name = (char *)key;
+    return v3_hash_buffer((uchar_t *)name, strlen(name));
+}
+
+static int file_eq_fn(addr_t key1, addr_t key2) {
+    char * name1 = (char *)key1;
+    char * name2 = (char *)key2;
+
+    return (strcmp(name1, name2) == 0);
+}
+
+static struct v3_config * parse_config(void * cfg_blob) {
+    struct v3_config * cfg = NULL;
+    int offset = 0;
+    uint_t xml_len = 0; 
+    struct file_idx_table * files = NULL;
+    v3_cfg_tree_t * file_tree = NULL;
+
+    V3_Print("cfg data at %p\n", cfg_blob);
+
+    if (memcmp(cfg_blob, "v3vee\0\0\0", 8) != 0) {
+       PrintError("Invalid Configuration Header\n");
+       return NULL;
+    }
 
-    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);
+    offset += 8;
+
+    cfg = (struct v3_config *)V3_Malloc(sizeof(struct v3_config));
+    memset(cfg, 0, sizeof(struct v3_config));
+
+    cfg->blob = cfg_blob;
+    INIT_LIST_HEAD(&(cfg->file_list));
+    cfg->file_table = v3_create_htable(0, file_hash_fn, file_eq_fn);
     
-    return length;
+    xml_len = *(uint32_t *)(cfg_blob + offset);
+    offset += 4;
+
+    cfg->cfg = (v3_cfg_tree_t *)v3_xml_parse((uint8_t *)(cfg_blob + offset));
+    offset += xml_len;
+   
+    offset += 8;
+
+    files = (struct file_idx_table *)(cfg_blob + offset);
+
+    V3_Print("Number of files in cfg: %d\n", (uint32_t)(files->num_files));
+
+    file_tree = v3_cfg_subtree(v3_cfg_subtree(cfg->cfg, "files"), "file");
+
+    while (file_tree) {
+       char * id = v3_cfg_val(file_tree, "id");
+       char * index = v3_cfg_val(file_tree, "index");
+       int idx = atoi(index);
+       struct file_hdr * hdr = &(files->hdrs[idx]);
+       struct v3_cfg_file * file = NULL;
+
+       file = (struct v3_cfg_file *)V3_Malloc(sizeof(struct v3_cfg_file));
+       
+       if (!file) {
+           PrintError("Could not allocate file structure\n");
+           return NULL;
+       }
+
+
+       V3_Print("File index=%d id=%s\n", idx, id);
+
+       strncpy(file->tag, id, 256);
+       file->size = hdr->size;
+       file->data = cfg_blob + hdr->offset;
+
+       V3_Print("Storing file data offset = %d, size=%d\n", (uint32_t)hdr->offset, hdr->size);
+       V3_Print("file data at %p\n", file->data);
+       list_add( &(file->file_node), &(cfg->file_list));
+
+       V3_Print("Keying file to name\n");
+       v3_htable_insert(cfg->file_table, (addr_t)(file->tag), (addr_t)(file));
+
+       V3_Print("Iterating to next file\n");
+
+       file_tree = v3_cfg_next_branch(file_tree);
+    }
+
+    V3_Print("Configuration parsed successfully\n");
+
+    return cfg;
 }
-#endif
 
-int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
-   extern v3_cpu_arch_t v3_cpu_types[];
 
-    // Amount of ram the Guest will have, rounded to a 4K page boundary
-    info->mem_size = config_ptr->mem_size & ~(addr_t)0xfff;
+static int pre_config_guest(struct guest_info * info, struct v3_config * config_ptr) {
+    extern v3_cpu_arch_t v3_cpu_types[];
+    char * memory_str = v3_cfg_val(config_ptr->cfg, "memory");
+    char * paging = v3_cfg_val(config_ptr->cfg, "paging");
+    char * schedule_hz_str = v3_cfg_val(config_ptr->cfg, "schedule_hz");
+    char * vm_class = v3_cfg_val(config_ptr->cfg, "class");
+    uint32_t sched_hz = 100;   // set the schedule frequency to 100 HZ
+    
+    if (!memory_str) {
+       PrintError("Memory is a required configuration parameter\n");
+       return -1;
+    }
+    
+    PrintDebug("Memory=%s\n", memory_str);
+
+    // Amount of ram the Guest will have, always in MB
+    info->mem_size = atoi(memory_str) * 1024 * 1024;
+    
+    if (strcasecmp(vm_class, "PC") == 0) {
+       info->vm_class = V3_PC_VM;
+    } else {
+       PrintError("Invalid VM class\n");
+       return -1;
+    }
 
-    info->cpu_id = config_ptr->guest_cpu;
 
     /*
      * Initialize the subsystem data strutures
      */
 #ifdef CONFIG_TELEMETRY
-    // This should go first, because other subsystems will depend on the guest_info flag
-    if (config_ptr->enable_telemetry) {
-       info->enable_telemetry = 1;
-       v3_init_telemetry(info);
-    } else {
-       info->enable_telemetry = 0;
+    {
+       char * telemetry = v3_cfg_val(config_ptr->cfg, "telemetry");
+
+       // This should go first, because other subsystems will depend on the guest_info flag    
+       if ((telemetry) && (strcasecmp(telemetry, "enable") == 0)) {
+           info->enable_telemetry = 1;
+           v3_init_telemetry(info);
+       } else {
+           info->enable_telemetry = 0;
+       }
     }
 #endif
 
@@ -99,10 +238,13 @@ int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_p
     v3_init_host_events(info);
 
     // Initialize the memory map
-    v3_init_shadow_map(info);
+    if (v3_init_shadow_map(info) == -1) {
+       PrintError("Could not initialize shadow map\n");
+       return -1;
+    }
     
     if ((v3_cpu_types[info->cpu_id] == V3_SVM_REV3_CPU) && 
-       (config_ptr->enable_nested_paging == 1)) {
+       (paging) && (strcasecmp(paging, "nested") == 0)) {
        PrintDebug("Guest Page Mode: NESTED_PAGING\n");
        info->shdw_pg_mode = NESTED_PAGING;
     } else {
@@ -111,7 +253,9 @@ int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_p
        info->shdw_pg_mode = SHADOW_PAGING;
     }
 
+#ifdef CONFIG_SYMBIOTIC
     v3_init_sym_iface(info);
+#endif
 
     v3_init_time(info);
     v3_init_interrupt_state(info);
@@ -124,25 +268,30 @@ int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_p
     v3_init_sym_swap(info);
 #endif
 
-
-    if (config_ptr->schedule_freq == 0) {
-       // set the schedule frequency to 100 HZ
-       config_ptr->schedule_freq = 100;
+    if (schedule_hz_str) {
+       sched_hz = atoi(schedule_hz_str);
     }
 
-    PrintDebug("CPU_KHZ = %d, schedule_freq=%p\n", V3_CPU_KHZ(), (void *)config_ptr->schedule_freq);
+    PrintDebug("CPU_KHZ = %d, schedule_freq=%p\n", V3_CPU_KHZ(), 
+              (void *)(addr_t)sched_hz);
 
-    info->yield_cycle_period = (V3_CPU_KHZ() * 1000) / config_ptr->schedule_freq;
+    info->yield_cycle_period = (V3_CPU_KHZ() * 1000) / sched_hz;
     
-    // Initial CPU operating mode
-    info->cpu_mode = REAL;
-    info->mem_mode = PHYSICAL_MEM;
+    if (info->vm_class == V3_PC_VM) {
+       if (pre_config_pc(info, config_ptr) == -1) {
+           PrintError("PC Post configuration failure\n");
+           return -1;
+       }
+    } else {
+       PrintError("Invalid VM Class\n");
+       return -1;
+    }
 
     return 0;
 }
 
 
-int v3_post_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
+static int post_config_guest(struct guest_info * info, struct v3_config * config_ptr) {
 
     // Configure the memory map for the guest
     if (setup_memory_map(info, config_ptr) == -1) {
@@ -162,333 +311,134 @@ int v3_post_config_guest(struct guest_info * info, struct v3_vm_config * config_
 
     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;
-}
-
-
-
-
-
-/* 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) {
-
-#ifdef CONFIG_PASSTHROUGH_VIDEO
-    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");
+    if (info->vm_class == V3_PC_VM) {
+       if (post_config_pc(info, config_ptr) == -1) {
+           PrintError("PC Post configuration failure\n");
            return -1;
        }
     } else {
-       v3_hook_write_mem(info, 0xa0000, 0xc0000, 0xa0000,  passthrough_mem_write, NULL);
-    }
-#endif
-
-#define VGABIOS_START 0x000c0000
-#define ROMBIOS_START 0x000f0000
-
-    /* layout vgabios */
-    {
-       extern uint8_t v3_vgabios_start[];
-       extern uint8_t v3_vgabios_end[];
-
-       addr_t vgabios_dst = v3_get_shadow_addr(&(info->mem_map.base_region), VGABIOS_START);
-       memcpy(V3_VAddr((void *)vgabios_dst), v3_vgabios_start, v3_vgabios_end - v3_vgabios_start);     
-    }
-    
-    /* layout rombios */
-    {
-       extern uint8_t v3_rombios_start[];
-       extern uint8_t v3_rombios_end[];
-
-       addr_t rombios_dst = v3_get_shadow_addr(&(info->mem_map.base_region), ROMBIOS_START);
-       memcpy(V3_VAddr((void *)rombios_dst), v3_rombios_start, v3_rombios_end - v3_rombios_start);
-    }
-
-#ifdef CONFIG_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;
-       }
+       PrintError("Invalid VM Class\n");
+       return -1;
     }
-#endif
 
-    v3_print_mem_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 v3_config_guest(struct guest_info * info, void * cfg_blob) {
+    v3_cpu_arch_t cpu_type = v3_get_cpu_type(v3_get_cpu_id());
 
-    v3_create_device(info, "CGA_VIDEO", (void *)1);
-    {
-       struct telnet_cons_cfg cons_cfg = {"CGA_VIDEO", 19997};
-       v3_create_device(info, "TELNET_CONSOLE", &cons_cfg);
+    if (cpu_type == V3_INVALID_CPU) {
+       PrintError("Configuring guest on invalid CPU\n");
+       return -1;
     }
 
-    if (config_ptr->enable_pci == 1) {
-       struct ide_cfg ide_config = {"PCI", "PIIX3"};
-       struct pci_passthrough_cfg pci_qemu_pt_cfg = {"PCI", "E1000", 0x8086, 0x100e};
-       struct pci_passthrough_cfg pci_hw_pt_cfg = {"PCI", "E1000", 0x8086, 0x107c};
-       
-       v3_create_device(info, "PCI", NULL);
-       v3_create_device(info, "i440FX", "PCI");
-       v3_create_device(info, "PIIX3", "PCI");
-       
-
-       v3_create_device(info, "LNX_VIRTIO_SYM", "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");
+    info->cfg_data = parse_config(cfg_blob);
 
-       v3_create_device(info, "IDE", &ide_config);
-       
-       v3_create_device(info, "PCI_PASSTHROUGH", &pci_qemu_pt_cfg);
-       v3_create_device(info, "PCI_PASSTHROUGH", &pci_hw_pt_cfg);
+    if (!info->cfg_data) {
+       PrintError("Could not parse configuration\n");
+       return -1;
+    }
 
+    V3_Print("Preconfiguration\n");
 
-    } else {
-       v3_create_device(info, "IDE", NULL);
+    if (pre_config_guest(info, info->cfg_data) == -1) {
+       PrintError("Error in preconfiguration\n");
+       return -1;
     }
 
+    V3_Print("Arch dependent configuration\n");
 
-    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);
-           }
+    // init SVM/VMX
+#ifdef CONFIG_SVM
+    if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) {
+       if (v3_init_svm_vmcb(info, info->vm_class) == -1) {
+           PrintError("Error in SVM initialization\n");
+           return -1;
+       }
+    } 
+#endif
+#ifdef CONFIG_VMX
+    else if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) {
+       if (v3_init_vmx_vmcs(info, info->vm_class) == -1) {
+           PrintError("Error in VMX initialization\n");
+           return -1;
        }
     }
+#endif
+    else {
+       PrintError("Invalid CPU Type\n");
+       return -1;
+    }
 
+    V3_Print("Post Configuration\n");
 
-
-    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 (post_config_guest(info, info->cfg_data) == -1) {
+       PrintError("Error in postconfiguration\n");
+       return -1;
     }
 
+    V3_Print("Configuration successfull\n");
+
+    return 0;
+}
 
 
-#ifdef CONFIG_GENERIC
-       configure_generic(info, config_ptr);
-#endif
 
-    // This should go last because it requires information about the Harddrives
-    v3_create_device(info, "NVRAM", "IDE");
-    
-    PrintDebugDevMgr(info);
 
-    return 0;
-}
 
+static int setup_memory_map(struct guest_info * info, struct v3_config * config_ptr) {
+    v3_cfg_tree_t * mem_region = v3_cfg_subtree(v3_cfg_subtree(config_ptr->cfg, "memmap"), "region");
 
+    while (mem_region) {
+       addr_t start_addr = atox(v3_cfg_val(mem_region, "start"));
+       addr_t end_addr = atox(v3_cfg_val(mem_region, "end"));
+       addr_t host_addr = atox(v3_cfg_val(mem_region, "host_addr"));
 
-#ifdef CONFIG_GENERIC
-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);
     
+       if (v3_add_shadow_mem(info, start_addr, end_addr, host_addr) == -1) {
+           PrintError("Could not map memory region: %p-%p => %p\n", 
+                      (void *)start_addr, (void *)end_addr, (void *)host_addr);
+           return -1;
+       }
 
-    struct vm_device * generic = v3_find_dev(info, "GENERIC");
-
-    if (!generic) {
-       PrintError("Could not find generic device\n");
-       return -1;
+       mem_region = v3_cfg_next_branch(mem_region);
     }
 
-    // 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
-    
+    return 0;
+}
 
-      
 
-    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) {
-       // 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
-#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)
-    
-#endif
 
-#if 1
 
-    // Make the parallel port invisible
-      
-    v3_generic_add_port_range(generic, 0x378, 0x37f, GENERIC_PRINT_AND_IGNORE);
 
-#endif
 
-#ifdef CONFIG_PASTHROUGH_VIDEO
+static int setup_devices(struct guest_info * info, struct v3_config * config_ptr) {
+    v3_cfg_tree_t * device = v3_cfg_subtree(v3_cfg_subtree(config_ptr->cfg, "devices"), "device");
 
-    // 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
+    while (device) {
+       char * id = v3_cfg_val(device, "id");
 
+       V3_Print("configuring device %s\n", id);
 
-#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);
-#endif
+       if (v3_create_device(info, id, device) == -1) {
+           PrintError("Error creating device %s\n", id);
+           return -1;
+       }
+       
+       device = v3_cfg_next_branch(device);
+    }
 
 
-#if 1
-    // Monitor any network card (realtek ne2000) operations 
-    v3_generic_add_port_range(generic, 0xc100, 0xc1ff, GENERIC_PRINT_AND_PASSTHROUGH);
-#endif
+   v3_print_dev_mgr(info);
 
-    //  v3_generic_add_port_range(generic, 0x378, 0x400, GENERIC_PRINT_AND_IGNORE);
-    
     return 0;
 }
-#endif
+
+