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.


config fix
[palacios.git] / palacios / src / palacios / vmm_config.c
index fd472dd..6ccf509 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.h>
 #include <palacios/vmm_debug.h>
 #include <palacios/vmm_msr.h>
+#include <palacios/vmm_decoder.h>
+#include <palacios/vmm_telemetry.h>
+#include <palacios/vmm_mem.h>
+#include <palacios/vmm_hypercall.h>
+#include <palacios/vmm_dev_mgr.h>
+#include <palacios/vmm_cpuid.h>
+#include <palacios/vmm_xml.h>
+#include <palacios/vmm_io.h>
+#include <palacios/vmm_msr.h>
+#include <palacios/vmm_mptable.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 <palacios/vmm_host_events.h>
+#include <palacios/vmm_socket.h>
 
-#define USE_GENERIC 1
+#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;
+};
 
-#define ROMBIOS_START 0x000f0000
-#define VGABIOS_START 0x000c0000
+struct file_idx_table {
+    uint64_t num_files;
+    struct file_hdr hdrs[0];
+};
 
 
 
-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 struct vm_device *  configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr);
 
+static int setup_memory_map(struct v3_vm_info * vm, v3_cfg_tree_t * cfg);
+static int setup_devices(struct v3_vm_info * vm, v3_cfg_tree_t * cfg);
 
 
-static int mem_test_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) {
-  int foo = 20;
 
+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;
 
-  memcpy(dst, &foo, length);
+    if ((child_entry != NULL) && (attrib != NULL)) {
+       PrintError("Duplicate Configuration parameters present for %s\n", tag);
+       return NULL;
+    }
 
-  PrintDebug("Passthrough mem read returning: %p (length=%d)\n", (void *)(foo + (guest_addr & 0xfff)), length);
-  return length;
+    if (attrib == NULL) {
+       val = v3_xml_txt(child_entry);
+       
+       if ( val[0] == 0 )
+               val = NULL;
+    } else {
+       val = attrib;
+    }
+    
+    return val;
 }
 
-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;
+v3_cfg_tree_t * v3_cfg_subtree(v3_cfg_tree_t * tree, char * tag) {
+    return v3_xml_child(tree, tag);
 }
 
-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;
+v3_cfg_tree_t * v3_cfg_next_branch(v3_cfg_tree_t * tree) {
+    return v3_xml_next(tree);
 }
 
 
 
-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_vmm_io_map(info);
-  v3_init_msr_map(info);
-  v3_init_interrupt_state(info);
-  v3_init_dev_mgr(info);
-  v3_init_emulator(info);
-  v3_init_host_events(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;
-  }
-  
-  // Initial CPU operating mode
-  info->cpu_mode = REAL;
-  info->mem_mode = PHYSICAL_MEM;
+struct v3_cfg_file * v3_cfg_get_file(struct v3_vm_info * vm, char * tag) {
+    struct v3_cfg_file * file = NULL;
 
-  // Amount of ram the Guest will have
-  info->mem_size = config_ptr->mem_size;
+    file = (struct v3_cfg_file *)v3_htable_search(vm->cfg_data->file_table, (addr_t)tag);
 
-  // Configure the memory map for the guest
-  setup_memory_map(info, config_ptr);
+    return file;
+}
 
-  // Configure the devices for the guest
-  setup_devices(info, config_ptr);
 
-  //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);
+static uint_t file_hash_fn(addr_t key) {
+    char * name = (char *)key;
+    return v3_hash_buffer((uchar_t *)name, strlen(name));
+}
 
-  // Setup initial cpu register state
-  info->rip = 0xfff0;
-  info->vm_regs.rsp = 0x0;
-  
+static int file_eq_fn(addr_t key1, addr_t key2) {
+    char * name1 = (char *)key1;
+    char * name2 = (char *)key2;
 
-  return 0;
+    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;
 
-/* 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) {
+    V3_Print("cfg data at %p\n", cfg_blob);
 
-  /* layout rombios */
-  {
-    uint_t num_pages = (config_ptr->rombios_size + PAGE_SIZE - 1) / PAGE_SIZE;
-    void * guest_mem =  V3_AllocPages(num_pages);
+    if (memcmp(cfg_blob, "v3vee\0\0\0", 8) != 0) {
+       PrintError("Invalid Configuration Header\n");
+       return NULL;
+    }
+
+    offset += 8;
 
-    PrintDebug("Layout Region %d bytes\n", config_ptr->rombios_size);
-    memcpy(V3_VAddr(guest_mem), config_ptr->rombios, config_ptr->rombios_size);
+    cfg = (struct v3_config *)V3_Malloc(sizeof(struct v3_config));
+    memset(cfg, 0, sizeof(struct v3_config));
 
-    add_shadow_region_passthrough(info, ROMBIOS_START, ROMBIOS_START + (num_pages * PAGE_SIZE), (addr_t)guest_mem);
+    cfg->blob = cfg_blob;
+    INIT_LIST_HEAD(&(cfg->file_list));
+    cfg->file_table = v3_create_htable(0, file_hash_fn, file_eq_fn);
     
-    PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", 
-              (void *)ROMBIOS_START, 
-              (void *)ROMBIOS_START + (num_pages * PAGE_SIZE), 
-              (void *)guest_mem);
-  }
+    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;
 
-  /* layout vgabios */
-  {
-    uint_t num_pages = (config_ptr->vgabios_size + PAGE_SIZE - 1) / PAGE_SIZE;
-    void * guest_mem =  V3_AllocPages(num_pages);
+    files = (struct file_idx_table *)(cfg_blob + offset);
 
-    PrintDebug("Layout Region %d bytes\n", config_ptr->vgabios_size);
-    memcpy(V3_VAddr(guest_mem), config_ptr->vgabios, config_ptr->vgabios_size);
+    V3_Print("Number of files in cfg: %d\n", (uint32_t)(files->num_files));
 
-    add_shadow_region_passthrough(info, VGABIOS_START, VGABIOS_START + (num_pages * PAGE_SIZE), (addr_t)guest_mem);
-    
-    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);
-  }  
-  
-  // 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");
-    }
-  } 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));
+    file_tree = v3_cfg_subtree(v3_cfg_subtree(cfg->cfg, "files"), "file");
 
-  return 0;
-}
+    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));
 
-static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) {
-    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();
+       V3_Print("Keying file to name\n");
+       v3_htable_insert(cfg->file_table, (addr_t)(file->tag), (addr_t)(file));
 
-    //struct vm_device * serial = v3_create_serial();
-    struct vm_device * generic = NULL;
+       V3_Print("Iterating to next file\n");
+
+       file_tree = v3_cfg_next_branch(file_tree);
+    }
+
+    V3_Print("Configuration parsed successfully\n");
+
+    return cfg;
+}
 
-    int use_ramdisk = config_ptr->use_ramdisk;
-    int use_generic = USE_GENERIC;
 
+static inline uint32_t get_alignment(char * align_str) {
+    // default is 4KB alignment
+    uint32_t alignment = PAGE_SIZE_4KB;
 
-    if (use_ramdisk) {
-      PrintDebug("Creating Ramdisk\n");
-      ramdisk = v3_create_ramdisk();
-      cdrom = v3_create_cdrom(ramdisk, config_ptr->ramdisk, config_ptr->ramdisk_size); 
+    if (align_str != NULL) {
+       if (strcasecmp(align_str, "2MB") == 0) {
+           alignment = PAGE_SIZE_2MB;
+       } else if (strcasecmp(align_str, "4MB") == 0) {
+           alignment = PAGE_SIZE_4MB;
+       }
     }
     
+#ifndef CONFIG_ALIGNED_PG_ALLOC
+    if (alignment != PAGE_SIZE_4KB) {
+       PrintError("Aligned page allocations are not supported in this host (requested alignment=%d)\n", alignment);
+       PrintError("Ignoring alignment request\n");
+    }
+#endif 
+
+    return alignment;
+}
+static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
+
+
+    char * memory_str = v3_cfg_val(vm_cfg, "memory");
+    char * schedule_hz_str = v3_cfg_val(vm_cfg, "schedule_hz");
+    char * vm_class = v3_cfg_val(vm_cfg, "class");
+    char * align_str = v3_cfg_val(v3_cfg_subtree(vm_cfg, "memory"), "alignment");
+    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;
+    }
     
-    if (use_generic) {
-      generic = configure_generic(info, config_ptr);
+    PrintDebug("Memory=%s\n", memory_str);
+    if (align_str) {
+        PrintDebug("Alignment=%s\n", align_str);
+    } else {
+        PrintDebug("Alignment defaulted to 4KB.\n");
     }
 
+    // Amount of ram the Guest will have, always in MB
+    vm->mem_size = atoi(memory_str) * 1024 * 1024;
+    vm->mem_align = get_alignment(align_str);
 
-    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);
+    PrintDebug("Alignment computed as 0x%x\n", vm->mem_align);
 
-    if (use_ramdisk) {
-      v3_attach_device(info, ramdisk);
-      v3_attach_device(info, cdrom);
+    if (strcasecmp(vm_class, "PC") == 0) {
+       vm->vm_class = V3_PC_VM;
+    } else {
+       PrintError("Invalid VM class\n");
+       return -1;
     }
 
-    if (use_generic) {
-      // Important that this be attached last!
-      v3_attach_device(info, generic);
+#ifdef CONFIG_TELEMETRY
+    {
+       char * telemetry = v3_cfg_val(vm_cfg, "telemetry");
+
+       // This should go first, because other subsystems will depend on the guest_info flag    
+       if ((telemetry) && (strcasecmp(telemetry, "enable") == 0)) {
+           vm->enable_telemetry = 1;
+       } else {
+           vm->enable_telemetry = 0;
+       }
+    }
+#endif
+
+    if (v3_init_vm(vm) == -1) {
+       PrintError("Failed to initialize VM\n");
+       return -1;
+    }
+
+
+
+   if (schedule_hz_str) {
+       sched_hz = atoi(schedule_hz_str);
     }
-    
-    PrintDebugDevMgr(info);
 
+    PrintDebug("CPU_KHZ = %d, schedule_freq=%p\n", V3_CPU_KHZ(), 
+              (void *)(addr_t)sched_hz);
 
-    // give keyboard interrupts to vm
-    // no longer needed since we have a keyboard device
-    //hook_irq(&vm_info, 1);
+    vm->yield_cycle_period = (V3_CPU_KHZ() * 1000) / sched_hz;
     
-#if 0
-    // give floppy controller to vm
-    v3_hook_passthrough_irq(info, 6);
-#endif
+    return 0;
+}
+
+static int determine_paging_mode(struct guest_info *info, v3_cfg_tree_t * core_cfg)
+{
+    extern v3_cpu_arch_t v3_cpu_types[];
+
+    v3_cfg_tree_t *vm_tree = info->vm_info->cfg_data->cfg;
+    v3_cfg_tree_t *pg_tree = v3_cfg_subtree(vm_tree, "paging");
+    char *pg_mode          = v3_cfg_val(pg_tree, "mode");
+    char *page_size        = v3_cfg_val(pg_tree, "page_size");
     
+    PrintDebug("Paging mode specified as %s\n", pg_mode);
+
+    if (pg_mode) {
+       if ((strcasecmp(pg_mode, "nested") == 0)) {
+           if (v3_cpu_types[info->cpu_id] == V3_SVM_REV3_CPU) {
+               info->shdw_pg_mode = NESTED_PAGING;
+           } else {
+               PrintError("Nested paging not supported on this hardware. Defaulting to shadow paging\n");
+               info->shdw_pg_mode = SHADOW_PAGING;
+           }
+       } else if ((strcasecmp(pg_mode, "shadow") == 0)) {
+           info->shdw_pg_mode = SHADOW_PAGING;
+       } else {
+           PrintError("Invalid paging mode (%s) specified in configuration. Defaulting to shadow paging\n", pg_mode);
+           info->shdw_pg_mode = SHADOW_PAGING;
+       }
+    } else {
+       PrintDebug("No paging type specified in configuration. Defaulting to shadow paging\n");
+       info->shdw_pg_mode = SHADOW_PAGING;
+    }
+
+
+    if (info->shdw_pg_mode == NESTED_PAGING) {
+       PrintDebug("Guest Paging Mode: NESTED_PAGING\n");
+       if (strcasecmp(page_size, "4kb") == 0) { /* TODO: this may not be an ideal place for this */
+           info->vm_info->paging_size = PAGING_4KB;
+       } else if (strcasecmp(page_size, "2mb") == 0) {
+           info->vm_info->paging_size = PAGING_2MB;
+       } else {
+           PrintError("Invalid VM paging size: '%s'\n", page_size);
+           return -1;
+       }
+       PrintDebug("VM page size=%s\n", page_size);
+    } else if (info->shdw_pg_mode == SHADOW_PAGING) {
+        PrintDebug("Guest Paging Mode: SHADOW_PAGING\n");
+    } else {
+       PrintError("Guest paging mode incorrectly set.\n");
+       return -1;
+    }
+
+    if (strcasecmp(v3_cfg_val(pg_tree, "large_pages"), "true") == 0) {
+       info->use_large_pages = 1;
+       PrintDebug("Use of large pages in memory virtualization enabled.\n");
+    }
+
+    return 0;
+}
+
+static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
+
+    if (determine_paging_mode(info, core_cfg))
+       return -1;
+
+    v3_init_core(info);
+
+    if (info->vm_info->vm_class == V3_PC_VM) {
+       if (pre_config_pc_core(info, core_cfg) == -1) {
+           PrintError("PC Post configuration failure\n");
+           return -1;
+       }
+    } else {
+       PrintError("Invalid VM Class\n");
+       return -1;
+    }
+
+    return 0;
+}
+
+
+
+static int post_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     
-    if (!use_ramdisk) {
-      PrintDebug("Hooking IDE IRQs\n");
-      
-      //primary ide
-      v3_hook_passthrough_irq(info, 14);
-      
-      // secondary ide
-      v3_hook_passthrough_irq(info, 15);    
-    }  
+    vm->run_state = VM_STOPPED;
+
+    // Configure the memory map for the guest
+    if (setup_memory_map(vm, cfg) == -1) {
+       PrintError("Setting up guest memory map failed...\n");
+       return -1;
+    }
     
+    //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);
+  
+    if (setup_devices(vm, cfg) == -1) {
+       PrintError("Failed to setup devices\n");
+       return -1;
+    }
+
+
+    //    v3_print_io_map(info);
+    v3_print_msr_map(vm);
+
 
-  return 0;
+    if (vm->vm_class == V3_PC_VM) {
+       if (post_config_pc(vm, cfg) == -1) {
+           PrintError("PC Post configuration failure\n");
+           return -1;
+       }
+    } else {
+       PrintError("Invalid VM Class\n");
+       return -1;
+    }
+
+    if (v3_inject_mptable(vm) == -1) { 
+       PrintError("Failed to inject mptable during configuration\n");
+       return -1;
+    }
+
+
+    return 0;
 }
 
 
 
-static struct vm_device *  configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr) {
-      PrintDebug("Creating Generic Device\n");
-      struct vm_device * 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
-      
-
-      
-
-      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
+static int post_config_core(struct guest_info * info, v3_cfg_tree_t * cfg) {
 
-#if 1
 
-      // Make the parallel port invisible
-      
-      v3_generic_add_port_range(generic, 0x378, 0x37f, GENERIC_PRINT_AND_IGNORE);
+    if (info->vm_info->vm_class == V3_PC_VM) {
+       if (post_config_pc_core(info, cfg) == -1) {
+           PrintError("PC Post configuration failure\n");
+           return -1;
+       }
+    } else {
+       PrintError("Invalid VM Class\n");
+       return -1;
+    }
 
-#endif
 
-#if 1
+    return 0;
+}
 
-      // 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
 
+static struct v3_vm_info * allocate_guest(int num_cores) {
+    int guest_state_size = sizeof(struct v3_vm_info) + (sizeof(struct guest_info) * num_cores);
+    struct v3_vm_info * vm = V3_Malloc(guest_state_size);
 
-#if 1
-      // Make the ISA PNP features invisible
+    memset(vm, 0, guest_state_size);
 
-      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
+    vm->num_cores = num_cores;
 
+    return vm;
+}
 
-#if 1
-      // 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);
-      
+struct v3_vm_info * v3_config_guest(void * cfg_blob) {
+    v3_cpu_arch_t cpu_type = v3_get_cpu_type(v3_get_cpu_id());
+    struct v3_config * cfg_data = NULL;
+    struct v3_vm_info * vm = NULL;
+    int num_cores = 0;
+    int i = 0;
+    v3_cfg_tree_t * cores_cfg = NULL;
+    v3_cfg_tree_t * per_core_cfg = NULL;
+
+    if (cpu_type == V3_INVALID_CPU) {
+       PrintError("Configuring guest on invalid CPU\n");
+       return NULL;
+    }
+
+    cfg_data = parse_config(cfg_blob);
+
+    if (!cfg_data) {
+       PrintError("Could not parse configuration\n");
+       return NULL;
+    }
+
+    cores_cfg = v3_cfg_subtree(cfg_data->cfg, "cores");
+
+    if (!cores_cfg) {
+       PrintError("Could not find core configuration (new config format required)\n");
+       return NULL;
+    }
+
+    num_cores = atoi(v3_cfg_val(cores_cfg, "count"));
+
+    if (num_cores == 0) {
+       PrintError("No cores specified in configuration\n");
+       return NULL;
+    }
+
+    V3_Print("Configuring %d cores\n", num_cores);
+
+    vm = allocate_guest(num_cores);    
+
+    if (!vm) {
+       PrintError("Could not allocate %d core guest\n", vm->num_cores);
+       return NULL;
+    }
+
+    vm->cfg_data = cfg_data;
+
+    V3_Print("Preconfiguration\n");
+
+    if (pre_config_vm(vm, vm->cfg_data->cfg) == -1) {
+       PrintError("Error in preconfiguration\n");
+       return NULL;
+    }
+
+
+    V3_Print("Per core configuration\n");
+    per_core_cfg = v3_cfg_subtree(cores_cfg, "core");
+
+    // per core configuration
+    for (i = 0; i < vm->num_cores; i++) {
+       struct guest_info * info = &(vm->cores[i]);
+
+       info->cpu_id = i;
+       info->vm_info = vm;
+
+       if (pre_config_core(info, per_core_cfg) == -1) {
+           PrintError("Error in core %d preconfiguration\n", i);
+           return NULL;
+       }
 
-      return generic;
+       per_core_cfg = v3_cfg_next_branch(per_core_cfg);
+    }
+
+
+    V3_Print("Post Configuration\n");
+
+    if (post_config_vm(vm, vm->cfg_data->cfg) == -1) {
+       PrintError("Error in postconfiguration\n");
+       return NULL;
+    }
+
+
+    per_core_cfg = v3_cfg_subtree(cores_cfg, "core");
+
+    // per core configuration
+    for (i = 0; i < vm->num_cores; i++) {
+       struct guest_info * info = &(vm->cores[i]);
+
+       post_config_core(info, per_core_cfg);
+
+       per_core_cfg = v3_cfg_next_branch(per_core_cfg);
+    }
+
+    V3_Print("Configuration successfull\n");
+
+    return vm;
+}
+
+
+
+
+
+static int setup_memory_map(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
+    v3_cfg_tree_t * mem_region = v3_cfg_subtree(v3_cfg_subtree(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"));
 
+    
+       if (v3_add_shadow_mem(vm, V3_MEM_CORE_ANY, 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;
+       }
+
+       mem_region = v3_cfg_next_branch(mem_region);
+    }
+
+    return 0;
+}
+
+
+
+
+static int setup_devices(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
+    v3_cfg_tree_t * device = v3_cfg_subtree(v3_cfg_subtree(cfg, "devices"), "device");
+
+    
+    while (device) {
+       char * dev_class = v3_cfg_val(device, "class");
+
+       V3_Print("configuring device %s\n", dev_class);
+
+       if (v3_create_device(vm, dev_class, device) == -1) {
+           PrintError("Error creating device %s\n", dev_class);
+           return -1;
+       }
+       
+       device = v3_cfg_next_branch(device);
+    }
+
+    v3_print_dev_mgr(vm);
+
+    return 0;
 }
+
+
+
+