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.


Cleanup and sanity-checking of before/after null-check and copy+paste errors (Coverit...
[palacios.git] / palacios / src / palacios / vmm_config.c
index d4bd23a..e4c9b4f 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/vmm_io.h>
+#include <palacios/vmm_msr.h>
+#include <palacios/vmm_sprintf.h>
+
 
-#ifdef CONFIG_SYMBIOTIC_SWAP
-#include <palacios/vmm_sym_swap.h>
+#ifdef V3_CONFIG_SWAPPING
+#include <palacios/vmm_swapping.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>
+#ifdef V3_CONFIG_MULTIBOOT
+#include <palacios/vmm_multiboot.h>
+#endif
 
-#include <devices/telnet_cons.h>
-#include <devices/pci_passthrough.h>
+#ifdef V3_CONFIG_HVM
+#include <palacios/vmm_hvm.h>
+#endif
 
+#include <palacios/vmm_host_events.h>
+#include <palacios/vmm_perftune.h>
 
+#include "vmm_config_class.h"
 
 
-#include <palacios/vmm_host_events.h>
+/* The Palacios cookie encodes "v3vee" followed by a 
+   3 byte version code.   There are currently two versions:
+
+    \0\0\0 => original (no checksum)
+    \0\0\1 => checksum
+*/
+#define COOKIE_LEN 8
+#define COOKIE_V0 "v3vee\0\0\0"
+#define COOKIE_V1 "v3vee\0\0\1"
+
+// This is used to access the configuration file index table
+struct file_hdr_v0 {
+    uint32_t index;
+    uint32_t size;
+    uint64_t offset;
+};
+
+struct file_hdr_v1 {
+    uint32_t index;
+    uint32_t size;
+    uint64_t offset;
+    ulong_t  hash;
+};
 
 
+struct file_idx_table_v0 {
+    uint64_t num_files;
+    struct file_hdr_v0 hdrs[0];
+};
 
-#include <palacios/vmm_socket.h>
+struct file_idx_table_v1 {
+    uint64_t num_files;
+    struct file_hdr_v1 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 int 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_extensions(struct v3_vm_info * vm, v3_cfg_tree_t * cfg);
+static int setup_devices(struct v3_vm_info * vm, v3_cfg_tree_t * cfg);
 
-#ifdef CONFIG_PASSTHROUGH_VIDEO
-static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) {
 
-    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);
+
+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(VM_NONE, VCORE_NONE, "Duplicate Configuration parameters present for %s\n", tag);
+       return NULL;
+    }
+
+    if (attrib == NULL) {
+       val = v3_xml_txt(child_entry);
+       
+       if ( val[0] == 0 )
+               val = NULL;
+    } else {
+       val = attrib;
+    }
     
-    return length;
+    return val;
 }
-#endif
 
-int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
-   extern v3_cpu_arch_t v3_cpu_types[];
+v3_cfg_tree_t * v3_cfg_subtree(v3_cfg_tree_t * tree, char * tag) {
+    return v3_xml_child(tree, tag);
+}
 
-    // Amount of ram the Guest will have, rounded to a 4K page boundary
-    info->mem_size = config_ptr->mem_size & ~(addr_t)0xfff;
+v3_cfg_tree_t * v3_cfg_next_branch(v3_cfg_tree_t * tree) {
+    return v3_xml_next(tree);
+}
 
-    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);
+
+struct v3_cfg_file * v3_cfg_get_file(struct v3_vm_info * vm, char * tag) {
+    struct v3_cfg_file * file = NULL;
+
+    file = (struct v3_cfg_file *)v3_htable_search(vm->cfg_data->file_table, (addr_t)tag);
+
+    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_v0 * files_v0 = NULL;
+    struct file_idx_table_v1 * files_v1 = NULL;
+    v3_cfg_tree_t * file_tree = NULL;
+    int version=-1;
+
+    V3_Print(VM_NONE, VCORE_NONE, "cfg data at %p\n", cfg_blob);
+
+    if (memcmp(cfg_blob, COOKIE_V0, COOKIE_LEN) == 0) {
+        version = 0;
+    } else if (memcmp(cfg_blob, COOKIE_V1, COOKIE_LEN) == 0) { 
+        version = 1;
     } else {
-       info->enable_telemetry = 0;
+       PrintError(VM_NONE, VCORE_NONE, "Invalid Configuration Header Or Unknown Version\n");
+       return NULL;
+    } 
+
+    V3_Print(VM_NONE, VCORE_NONE, "Handling Palacios Image Format, Version 0x%x\n",version);
+
+    offset += COOKIE_LEN;
+
+    cfg = (struct v3_config *)V3_Malloc(sizeof(struct v3_config));
+
+    if (!cfg) {
+       PrintError(VM_NONE, VCORE_NONE, "Unable to allocate while parsing\n");
+       return NULL;
     }
-#endif
 
-    v3_init_hypercall_map(info);
-    v3_init_io_map(info);
-    v3_init_msr_map(info);
-    v3_init_host_events(info);
+    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);
 
-    // Initialize the memory map
-    v3_init_shadow_map(info);
+    if (!(cfg->file_table)) {
+       PrintError(VM_NONE, VCORE_NONE, "Unable to allocate hash table while parsing\n");
+       V3_Free(cfg);
+       return NULL;
+    }
     
-    if ((v3_cpu_types[info->cpu_id] == V3_SVM_REV3_CPU) && 
-       (config_ptr->enable_nested_paging == 1)) {
-       PrintDebug("Guest Page Mode: NESTED_PAGING\n");
-       info->shdw_pg_mode = NESTED_PAGING;
+    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;
+
+    // This is hideous, but the file formats are still very close
+    if (version==0) { 
+       files_v0 = (struct file_idx_table_v0 *)(cfg_blob + offset);
+       V3_Print(VM_NONE, VCORE_NONE, "Number of files in cfg: %d\n", (uint32_t)(files_v0->num_files));
     } else {
-       PrintDebug("Guest Page Mode: SHADOW_PAGING\n");
-       v3_init_shadow_page_state(info);
-       info->shdw_pg_mode = SHADOW_PAGING;
+       files_v1 = (struct file_idx_table_v1 *)(cfg_blob + offset);
+       V3_Print(VM_NONE, VCORE_NONE, "Number of files in cfg: %d\n", (uint32_t)(files_v1->num_files));
     }
 
-    v3_init_sym_iface(info);
 
-    v3_init_time(info);
-    v3_init_interrupt_state(info);
-    v3_init_exception_state(info);
-    v3_init_dev_mgr(info);
-    v3_init_decoder(info);
-    
-#ifdef CONFIG_SYMBIOTIC_SWAP
-    PrintDebug("initializing symbiotic swap\n");
-    v3_init_sym_swap(info);
-#endif
+    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 v3_cfg_file * file = NULL;
 
-    if (config_ptr->schedule_freq == 0) {
-       // set the schedule frequency to 100 HZ
-       config_ptr->schedule_freq = 100;
+       file = (struct v3_cfg_file *)V3_Malloc(sizeof(struct v3_cfg_file));
+       
+       if (!file) {
+           PrintError(VM_NONE, VCORE_NONE, "Could not allocate file structure\n");
+           v3_free_htable(cfg->file_table,0,0);
+           V3_Free(cfg);
+           return NULL;
+       }
+
+       V3_Print(VM_NONE, VCORE_NONE, "File index=%d id=%s\n", idx, id);
+
+       strncpy(file->tag, id, V3_MAX_TAG_LEN);
+       file->tag[V3_MAX_TAG_LEN-1] = 0 ;
+
+       if (version==0) { 
+           struct file_hdr_v0 * hdr = &(files_v0->hdrs[idx]);
+
+           file->size = hdr->size;
+           file->data = cfg_blob + hdr->offset;
+           file->hash = 0;
+           
+           V3_Print(VM_NONE, VCORE_NONE, "Storing file data offset = %d, size=%d\n", (uint32_t)hdr->offset, hdr->size);
+           V3_Print(VM_NONE, VCORE_NONE, "file data at %p\n", file->data);
+
+       } else if (version==1) { 
+           struct file_hdr_v1 * hdr = &(files_v1->hdrs[idx]);
+           unsigned long hash;
+
+           file->size = hdr->size;
+           file->data = cfg_blob + hdr->offset;
+           file->hash = hdr->hash;
+
+           V3_Print(VM_NONE, VCORE_NONE, "Storing file data offset = %d, size=%d\n", (uint32_t)hdr->offset, hdr->size);
+           V3_Print(VM_NONE, VCORE_NONE, "file data at %p\n", file->data);
+           V3_Print(VM_NONE, VCORE_NONE, "Checking file data integrity...\n");
+           if ((hash = v3_hash_buffer(file->data, file->size)) != file->hash) {
+               PrintError(VM_NONE, VCORE_NONE, "File data corrupted! (orig hash=0x%lx, new=0x%lx\n",
+                          file->hash, hash);
+               return NULL;
+           }
+           V3_Print(VM_NONE, VCORE_NONE, "File data OK\n");
+           
+       }
+           
+           
+       list_add( &(file->file_node), &(cfg->file_list));
+
+       V3_Print(VM_NONE, VCORE_NONE, "Keying file to name\n");
+       v3_htable_insert(cfg->file_table, (addr_t)(file->tag), (addr_t)(file));
+
+       V3_Print(VM_NONE, VCORE_NONE, "Iterating to next file\n");
+
+       file_tree = v3_cfg_next_branch(file_tree);
     }
 
-    PrintDebug("CPU_KHZ = %d, schedule_freq=%p\n", V3_CPU_KHZ(), (void *)config_ptr->schedule_freq);
+    V3_Print(VM_NONE, VCORE_NONE, "Configuration parsed successfully\n");
+
+    return cfg;
+}
+
+
+static inline uint32_t get_alignment(char * align_str) {
+    // default is 4KB alignment
+    uint32_t alignment = PAGE_SIZE_4KB;
 
-    info->yield_cycle_period = (V3_CPU_KHZ() * 1000) / config_ptr->schedule_freq;
+    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;
+       }
+    }
     
-    // Initial CPU operating mode
-    info->cpu_mode = REAL;
-    info->mem_mode = PHYSICAL_MEM;
+#ifndef V3_CONFIG_ALIGNED_PG_ALLOC
+    if (alignment != PAGE_SIZE_4KB) {
+       PrintError(VM_NONE, VCORE_NONE, "Aligned page allocations are not supported in this host (requested alignment=%d)\n", alignment);
+       PrintError(VM_NONE, VCORE_NONE, "Ignoring alignment request\n");
+       alignment = PAGE_SIZE_4KB;
+    }
+#endif 
 
-    return 0;
+    return alignment;
 }
 
 
-int v3_post_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
 
-    // Configure the memory map for the guest
-    if (setup_memory_map(info, config_ptr) == -1) {
-       PrintError("Setting up guest memory map failed...\n");
+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(VM_NONE, VCORE_NONE, "Memory is a required configuration parameter\n");
        return -1;
     }
     
-    //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);
-  
-    if (setup_devices(info, config_ptr) == -1) {
-       PrintError("Failed to setup devices\n");
+    PrintDebug(VM_NONE, VCORE_NONE, "Memory=%s\n", memory_str);
+    if (align_str) {
+        PrintDebug(VM_NONE, VCORE_NONE, "Alignment=%s\n", align_str);
+    } else {
+        PrintDebug(VM_NONE, VCORE_NONE, "Alignment defaulted to 4KB.\n");
+    }
+
+    // Amount of ram the Guest will have, always in MB
+    vm->mem_size = (addr_t)atoi(memory_str) * 1024 * 1024;
+    vm->mem_align = get_alignment(align_str);
+
+    // set up defaults for memory management for threads associated 
+    // with this VM
+    vm->resource_control.pg_alignment=vm->mem_align;
+    vm->resource_control.pg_node_id=-1;
+    
+#ifdef V3_CONFIG_SWAPPING
+    if (v3_init_swapping_vm(vm,vm_cfg)) {
+       PrintError(vm,VCORE_NONE,"Unable to initialize swapping correctly\n");
        return -1;
     }
+    if (vm->swap_state.enable_swapping) { 
+       PrintDebug(vm,VCORE_NONE,"Swapping enabled\n");
+    } else {
+       PrintDebug(vm,VCORE_NONE,"Swapping disabled\n");
+    }
+#endif
+        
+    PrintDebug(VM_NONE, VCORE_NONE, "Alignment for %lu bytes of memory computed as 0x%x\n", vm->mem_size, vm->mem_align);
 
-    v3_print_io_map(info);
-    v3_print_msr_map(info);
+    if (strcasecmp(vm_class, "PC") == 0) {
+       vm->vm_class = V3_PC_VM;
+    } else {
+       PrintError(VM_NONE, VCORE_NONE, "Invalid VM class\n");
+       return -1;
+    }
 
-    info->run_state = VM_STOPPED;
+#ifdef V3_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
 
-    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;
+    if (v3_init_vm(vm) == -1) {
+       PrintError(VM_NONE, VCORE_NONE, "Failed to initialize VM\n");
+       return -1;
+    }
 
+#ifdef V3_CONFIG_MULTIBOOT
+    if (v3_init_multiboot_vm(vm,vm_cfg)) { 
+       PrintError(vm,VCORE_NONE,"Cannot initialize Multiboot for VM\n");
+       return -1;
+    }
+#endif
+#ifdef V3_CONFIG_HVM
+    if (v3_init_hvm_vm(vm,vm_cfg)) { 
+       PrintError(vm,VCORE_NONE,"Cannot initialize HVM for VM\n");
+       return -1;
+    }
+#endif
+
+   if (schedule_hz_str) {
+       sched_hz = atoi(schedule_hz_str);
+    }
+
+    PrintDebug(VM_NONE, VCORE_NONE, "CPU_KHZ = %d, schedule_freq=%p\n", V3_CPU_KHZ(), 
+              (void *)(addr_t)sched_hz);
+
+    vm->yield_cycle_period = (V3_CPU_KHZ() * 1000) / sched_hz;
+    
     return 0;
 }
 
 
+static int determine_paging_mode(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
+    extern v3_cpu_arch_t v3_mach_type;
+
+    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");
+    
+    PrintDebug(info->vm_info, info, "Paging mode specified as %s\n", pg_mode);
+
+    if (pg_mode) {
+       if ((strcasecmp(pg_mode, "nested") == 0)) {
+           // we assume symmetric cores, so if core 0 has nested paging they all do
+           if ((v3_mach_type == V3_SVM_REV3_CPU) || 
+               (v3_mach_type == V3_VMX_EPT_CPU) ||
+               (v3_mach_type == V3_VMX_EPT_UG_CPU)) {
+               
+               V3_Print(info->vm_info, info, "Setting paging mode to NESTED\n");
+               info->shdw_pg_mode = NESTED_PAGING;
+           } else {
+               PrintError(info->vm_info, info, "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)) {
+           V3_Print(info->vm_info, info, "Setting paging mode to SHADOW\n");
+           info->shdw_pg_mode = SHADOW_PAGING;
+       } else {
+           PrintError(info->vm_info, info, "Invalid paging mode (%s) specified in configuration. Defaulting to shadow paging\n", pg_mode);
+           info->shdw_pg_mode = SHADOW_PAGING;
+       }
+    } else {
+       V3_Print(info->vm_info, info, "No paging type specified in configuration. Defaulting to shadow paging\n");
+       info->shdw_pg_mode = SHADOW_PAGING;
+    }
+
+
+    if (v3_cfg_val(pg_tree, "large_pages") != NULL) {
+       if (strcasecmp(v3_cfg_val(pg_tree, "large_pages"), "true") == 0) {
+           info->use_large_pages = 1;
+           PrintDebug(info->vm_info, info, "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) != 0) {
+       return -1;
+    }
 
+    if (v3_init_core(info) == -1) {
+       PrintError(info->vm_info, info, "Error Initializing Core\n");
+       return -1;
+    }
 
-/* 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 V3_CONFIG_MULTIBOOT
+    if (v3_init_multiboot_core(info)) { 
+       PrintError(info->vm_info, info, "Error Initializing Multiboot Core\n");
+       return -1;
+    }
+#endif
+#ifdef V3_CONFIG_HVM
+    if (v3_init_hvm_core(info)) { 
+       PrintError(info->vm_info, info, "Error Initializing HVM Core\n");
+       return -1;
+    }
+#endif
 
-#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_info->vm_class == V3_PC_VM) {
+       if (pre_config_pc_core(info, core_cfg) == -1) {
+           PrintError(info->vm_info, info, "PC Post configuration failure\n");
            return -1;
        }
     } else {
-       v3_hook_write_mem(info, 0xa0000, 0xc0000, 0xa0000,  passthrough_mem_write, NULL);
+       PrintError(info->vm_info, info, "Invalid VM Class\n");
+       return -1;
     }
-#endif
 
-#define VGABIOS_START 0x000c0000
-#define ROMBIOS_START 0x000f0000
+    return 0;
+}
 
-    /* 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);     
-    }
+
+static int post_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     
-    /* 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);
+
+    // Configure the memory map for the guest
+    if (setup_memory_map(vm, cfg) == -1) {
+        PrintError(vm, VCORE_NONE,"Setting up guest memory map failed...\n");
+       return -1;
     }
 
-#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");
+
+    if (vm->vm_class == V3_PC_VM) {
+       if (post_config_pc(vm, cfg) == -1) {
+           PrintError(vm, VCORE_NONE,"PC Post configuration failure\n");
            return -1;
        }
+    } else {
+       PrintError(vm, VCORE_NONE,"Invalid VM Class\n");
+       return -1;
     }
-#endif
 
-    v3_print_mem_map(info);
+
+
+    // Initialize fw_cfg state for VMM<->VM SEABIOS communication
+    if (v3_fw_cfg_init(vm) == -1) {
+       PrintError(vm, VCORE_NONE, "Error initializing Firmware Config (fw_cfg) state\n");
+       return -1;
+    }
+
+    /* 
+     * Initialize configured devices
+     */
+    if (setup_devices(vm, cfg) == -1) {
+       PrintError(vm, VCORE_NONE,"Failed to setup devices\n");
+       return -1;
+    }
+
+
+    //    v3_print_io_map(info);
+    v3_print_msr_map(vm);
+
+
+
+
+    /* 
+     * Initialize configured extensions 
+     */
+    if (setup_extensions(vm, cfg) == -1) {
+       PrintError(vm, VCORE_NONE,"Failed to setup extensions\n");
+       return -1;
+    }
+
+    if (v3_setup_performance_tuning(vm, cfg) == -1) { 
+       PrintError(vm, VCORE_NONE,"Failed to configure performance tuning parameters\n");
+       return -1;
+    }
+
+
+    vm->run_state = VM_STOPPED;
 
     return 0;
 }
 
 
 
-static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) {
+static int post_config_core(struct guest_info * info, v3_cfg_tree_t * cfg) {
 
-    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);
-    
+    if (v3_init_core_extensions(info) == -1) {
+        PrintError(info->vm_info, info, "Error intializing extension core states\n");
+        return -1;
+    }
 
-    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 (info->vm_info->vm_class == V3_PC_VM) {
+       if (post_config_pc_core(info, cfg) == -1) {
+           PrintError(info->vm_info, info, "PC Post configuration failure\n");
+           return -1;
+       }
+    } else {
+       PrintError(info->vm_info, info, "Invalid VM Class\n");
+       return -1;
     }
 
-    if (config_ptr->enable_pci == 1) {
-       struct ide_cfg ide_config = {"PCI", "PIIX3"};
-       struct pci_passthrough_cfg pci_pt_cfg = {"PCI", "E1000", 0x8086, 0x100e};
-       
-       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");
+    return 0;
+}
 
-       v3_create_device(info, "IDE", &ide_config);
-       
-       v3_create_device(info, "PCI_PASSTHROUGH", &pci_pt_cfg);
 
-    } else {
-       v3_create_device(info, "IDE", NULL);
+
+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 (!vm) {
+        PrintError(VM_NONE, VCORE_NONE, "Unable to allocate space for guest data structures\n");
+       return NULL;
     }
 
+    int i = 0;
 
-    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};
+    memset(vm, 0, guest_state_size);
 
-               PrintDebug("Creating RAM CD\n");
+    vm->num_cores = num_cores;
 
-               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");
+    for (i = 0; i < num_cores; i++) {
+       vm->cores[i].core_run_state = CORE_INVALID;
+    }
 
-               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);
-           }
-       }
+    vm->run_state = VM_INVALID;
+
+    return vm;
+}
+
+/*
+   
+
+*/
+
+
+struct v3_vm_info * v3_config_guest(void * cfg_blob, void * priv_data) {
+    extern v3_cpu_arch_t v3_mach_type;
+    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 (v3_mach_type == V3_INVALID_CPU) {
+       PrintError(VM_NONE, VCORE_NONE, "Configuring guest on invalid CPU\n");
+       return NULL;
     }
 
+    cfg_data = parse_config(cfg_blob);
 
 
-    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};
+    if (!cfg_data) {
+       PrintError(VM_NONE, VCORE_NONE, "Could not parse configuration\n");
+       return NULL;
+    }
 
-               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);
-           }
-       }
+    cores_cfg = v3_cfg_subtree(cfg_data->cfg, "cores");
+
+    if (!cores_cfg) {
+       PrintError(VM_NONE, VCORE_NONE, "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(VM_NONE, VCORE_NONE, "No cores specified in configuration\n");
+       return NULL;
     }
 
+    V3_Print(VM_NONE, VCORE_NONE, "Configuring %d cores\n", num_cores);
+
+    vm = allocate_guest(num_cores);    
 
+    if (!vm) {
+       PrintError(VM_NONE, VCORE_NONE, "Could not allocate %d core guest\n", num_cores);
+       return NULL;
+    }
 
-#ifdef CONFIG_GENERIC
-       configure_generic(info, config_ptr);
+#ifdef V3_CONFIG_CACHEPART
+    // Need to initialize cache management and resource control
+    // as early as possible so that allocations are done accordingly
+    if (v3_init_cachepart_vm(vm,cfg_data->cfg)) {
+       PrintError(VM_NONE, VCORE_NONE, "Could not initialize cache partioning\n");
+       V3_Free(vm);
+       return NULL;
+    }
 #endif
 
-    // This should go last because it requires information about the Harddrives
-    v3_create_device(info, "NVRAM", "IDE");
-    
-    PrintDebugDevMgr(info);
+    vm->host_priv_data = priv_data;
 
-    return 0;
-}
+    vm->cfg_data = cfg_data;
 
+    V3_Print(vm, VCORE_NONE, "Preconfiguration\n");
 
+    if (pre_config_vm(vm, vm->cfg_data->cfg) == -1) {
+       PrintError(vm, VCORE_NONE, "Error in preconfiguration, attempting to free\n");
+       vm->run_state=VM_ERROR;
+       v3_free_vm(vm);
+       return NULL;
+    }
 
-#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);
-    
+    V3_Print(vm, VCORE_NONE, "Per core configuration\n");
+    per_core_cfg = v3_cfg_subtree(cores_cfg, "core");
 
-    struct vm_device * generic = v3_find_dev(info, "GENERIC");
+    // per core configuration
+    for (i = 0; i < vm->num_cores; i++) {
+       struct guest_info * info = &(vm->cores[i]);
 
-    if (!generic) {
-       PrintError("Could not find generic device\n");
-       return -1;
+       info->vcpu_id = i;
+       info->vm_info = vm;
+       info->core_cfg_data = per_core_cfg;
+
+       if (pre_config_core(info, per_core_cfg) == -1) {
+           PrintError(vm, VCORE_NONE, "Error in core %d preconfiguration, attempting to free guest\n", i);
+           vm->run_state=VM_ERROR;
+           v3_free_vm(vm);
+           return NULL;
+       }
+
+
+       per_core_cfg = v3_cfg_next_branch(per_core_cfg);
     }
 
-    // port 0x92: A20 enable/disable (bit 2) (This causes an MMU flush)
 
+    V3_Print(vm, VCORE_NONE, "Post Configuration\n");
 
-    // 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
-    
+    if (post_config_vm(vm, vm->cfg_data->cfg) == -1) {
+        PrintError(vm, VCORE_NONE, "Error in postconfiguration, attempting to free guest\n");
+       vm->run_state=VM_ERROR;
+       v3_free_vm(vm);
+       return NULL;
+    }
 
-      
 
-    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
+    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]);
 
-    // 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
+       post_config_core(info, per_core_cfg);
+
+       per_core_cfg = v3_cfg_next_branch(per_core_cfg);
     }
-      
 
-    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
+    V3_Print(vm, VCORE_NONE, "Configuration successfull\n");
 
-#if 1
+    return vm;
+}
 
-    // Make the parallel port invisible
-      
-    v3_generic_add_port_range(generic, 0x378, 0x37f, GENERIC_PRINT_AND_IGNORE);
 
-#endif
 
-#ifdef CONFIG_PASTHROUGH_VIDEO
+int v3_free_config(struct v3_vm_info * vm) {
+   
+    v3_free_htable(vm->cfg_data->file_table, 1, 0);
+
+    v3_xml_free(vm->cfg_data->cfg);
+
+    V3_Free(vm->cfg_data);
+    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
 
 
-#if 1
-    // Make the ISA PNP features invisible
+
+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"));
+
     
-    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_add_shadow_mem(vm, V3_MEM_CORE_ANY, start_addr, end_addr, host_addr) == -1) {
+           PrintError(vm, VCORE_NONE,"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);
+    }
 
-#if 1
-    // Monitor any network card (realtek ne2000) operations 
-    v3_generic_add_port_range(generic, 0xc100, 0xc1ff, GENERIC_PRINT_AND_PASSTHROUGH);
-#endif
+    return 0;
+}
+
+
+static int setup_extensions(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
+    v3_cfg_tree_t * extension = v3_cfg_subtree(v3_cfg_subtree(cfg, "extensions"), "extension");
+
+    while (extension) {
+       char * ext_name = v3_cfg_val(extension, "name");
+
+        if (!ext_name) {
+           PrintError(vm, VCORE_NONE, "Extension has no name\n");
+            return -1;
+        }
+
+       V3_Print(vm, VCORE_NONE, "Configuring extension %s\n", ext_name);
+
+       if (v3_add_extension(vm, ext_name, extension) == -1) {
+           PrintError(vm, VCORE_NONE, "Error adding extension %s\n", ext_name);
+           return -1;
+       }
+
+       extension = v3_cfg_next_branch(extension);
+    }
+
+    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");
 
-    //  v3_generic_add_port_range(generic, 0x378, 0x400, GENERIC_PRINT_AND_IGNORE);
     
+    while (device) {
+       char * dev_class = v3_cfg_val(device, "class");
+
+       V3_Print(vm, VCORE_NONE, "configuring device %s\n", dev_class);
+
+       if (v3_create_device(vm, dev_class, device) == -1) {
+           PrintError(vm, VCORE_NONE, "Error creating device %s\n", dev_class);
+           return -1;
+       }
+       
+       device = v3_cfg_next_branch(device);
+    }
+
+    v3_print_dev_mgr(vm);
+
     return 0;
 }
-#endif
+
+
+