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.


moved vmx/svm arch maps to global setup
[palacios.git] / palacios / src / palacios / vmm_config.c
index ec242b6..e3bc57b 100644 (file)
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
-/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
-
+ /* 
+ * 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.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
 
 #include <palacios/vmm_config.h>
 #include <palacios/vmm.h>
 #include <palacios/vmm_debug.h>
+#include <palacios/vmm_msr.h>
+#include <palacios/vmm_decoder.h>
+#include <palacios/vmm_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>
+
+
+#ifdef CONFIG_SYMBIOTIC
+#include <palacios/vmm_sym_iface.h>
+
+#ifdef CONFIG_SYMBIOTIC_SWAP
+#include <palacios/vmm_sym_swap.h>
+#endif
+
+#endif
 
 
-#include <devices/serial.h>
-#include <devices/keyboard.h>
-#include <devices/8259a.h>
-#include <devices/8254.h>
-#include <devices/nvram.h>
-#include <devices/generic.h>
+#ifdef CONFIG_SVM
+#include <palacios/svm.h>
+#include <palacios/svm_io.h>
+#include <palacios/svm_msr.h>
+#endif
 
-//Zheng 09/29/2008
-#ifdef RAMDISK_BOOT
-#include <devices/ramdisk.h>
+#ifdef CONFIG_VMX
+#include <palacios/vmx.h>
+#include <palacios/vmx_io.h>
+#include <palacios/vmx_msr.h>
 #endif
 
 
-static int mem_test_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) {
-  int foo = 20;
+#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;
+};
+
+struct file_idx_table {
+    uint64_t num_files;
+    struct file_hdr hdrs[0];
+};
+
+
+
+
+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);
 
 
-  memcpy(dst, &foo, length);
 
-  PrintDebug("Passthrough mem read returning: %d (length=%d)\n", foo + (guest_addr & 0xfff), length);
-  return length;
+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; 
 }
 
-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);
 }
 
 
-/*static int IO_Read(ushort_t port, void * dst, uint_t length, void * priv_data) {
 
-  struct guest_info * info = priv_data;
-  ulong_t tsc_spread = 0;
-  ullong_t exit_tsc = 0;
+struct v3_cfg_file * v3_cfg_get_file(struct v3_vm_info * vm, char * tag) {
+    struct v3_cfg_file * file = NULL;
 
-  
-  *(ulong_t *)(&exit_tsc) = info->vm_regs.rbx;
-  *(ulong_t *)((&exit_tsc) + 4) = info->vm_regs.rcx; 
-  tsc_spread = info->exit_tsc - exit_tsc;
-  
-  PrintError("IOREAD tsc diff = %lu\n",tsc_spread); 
-  info->rip += 3;
+    file = (struct v3_cfg_file *)v3_htable_search(vm->cfg_data->file_table, (addr_t)tag);
+
+    return file;
+}
 
 
-  return 1;
+static uint_t file_hash_fn(addr_t key) {
+    char * name = (char *)key;
+    return v3_hash_buffer((uchar_t *)name, strlen(name));
 }
-*/
 
-int config_guest(struct guest_info * info, void * config_ptr) {
+static int file_eq_fn(addr_t key1, addr_t key2) {
+    char * name1 = (char *)key1;
+    char * name2 = (char *)key2;
 
-  struct guest_mem_layout * layout = (struct guest_mem_layout *)config_ptr;
-  extern v3_cpu_arch_t v3_cpu_type;
-  void * region_start;
-  int i;
+    return (strcmp(name1, name2) == 0);
+}
 
-  
-  v3_init_time(info);
-  init_shadow_map(info);
-  
-  if (v3_cpu_type == V3_SVM_REV3_CPU) {
-    info->shdw_pg_mode = NESTED_PAGING;
-  } else {
-    init_shadow_page_state(info);
-    info->shdw_pg_mode = SHADOW_PAGING;
-  }
-  
-  info->cpu_mode = REAL;
-  info->mem_mode = PHYSICAL_MEM;
-  
-  init_vmm_io_map(info);
-  init_interrupt_state(info);
-  
-  dev_mgr_init(info);
+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;
 
-  init_emulator(info);
-  
-  //     SerialPrint("Guest Mem Dump at 0x%x\n", 0x100000);
-  //PrintDebugMemDump((unsigned char *)(0x100000), 261 * 1024);
-  if (layout->magic != MAGIC_CODE) {
-    
-    PrintDebug("Layout Magic Mismatch (0x%x)\n", layout->magic);
-    return -1;
-  }
-  
-  PrintDebug("%d layout regions\n", layout->num_regions);
-  
-  region_start = (void *)&(layout->regions[layout->num_regions]);
-  
-  PrintDebug("region start = 0x%x\n", region_start);
-  
-  for (i = 0; i < layout->num_regions; i++) {
-    struct layout_region * reg = &(layout->regions[i]);
-    uint_t num_pages = (reg->length / PAGE_SIZE) + ((reg->length % PAGE_SIZE) ? 1 : 0);
-    void * guest_mem = V3_AllocPages(num_pages);
-    
-    PrintDebug("Layout Region %d bytes\n", reg->length);
-    memcpy(guest_mem, region_start, reg->length);
-    
-    PrintDebugMemDump((unsigned char *)(guest_mem), 16);
-    
-    add_shadow_region_passthrough(info, reg->final_addr, reg->final_addr + (num_pages * PAGE_SIZE), (addr_t)guest_mem);
-    
-    PrintDebug("Adding Shadow Region (0x%x-0x%x) -> 0x%x\n", reg->final_addr, reg->final_addr + (num_pages * PAGE_SIZE), guest_mem);
-    
-    region_start += reg->length;
-  }
-  
-      //     
-  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");
+    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;
     }
-  } else {
-    add_shadow_region_passthrough(info, 0xc0000, 0xc8000, 0xc0000);
-    add_shadow_region_passthrough(info, 0xc8000, 0xf0000, 0xc8000);
-  }
-  
-  
-  if (1) {
-  add_shadow_region_passthrough(info, 0x100000, 0x1000000, (addr_t)V3_AllocPages(4096));
-  } else {
-    /* MEMORY HOOK TEST */
-    add_shadow_region_passthrough(info, 0x100000, 0xa00000, (addr_t)V3_AllocPages(2304));
-    hook_guest_mem(info, 0xa00000, 0xa01000, mem_test_read, passthrough_mem_write, NULL); 
-    add_shadow_region_passthrough(info, 0xa01000, 0x1000000, (addr_t)V3_AllocPages(1791));
-  }
-
-    add_shadow_region_passthrough(info, 0x1000000, 0x8000000, (addr_t)V3_AllocPages(32768));
-  // test - give linux accesss to PCI space - PAD
-  add_shadow_region_passthrough(info, 0xc0000000,0xffffffff,0xc0000000);
-  
-  
-  print_shadow_map(&(info->mem_map));
 
-  
-  {
-    
-    struct vm_device * nvram = create_nvram();
-    //struct vm_device * timer = create_timer();
-    struct vm_device * pic = create_pic();
-    struct vm_device * keyboard = create_keyboard();
-    struct vm_device * pit = create_pit(); 
-    //struct vm_device * serial = create_serial();
-    
-    //Zheng 09/29/2008
+    offset += 8;
 
-#ifdef RAMDISK_BOOT
-    struct vm_device * ramdisk = create_ramdisk();
-#endif
-    
-#define GENERIC 1
+    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);
     
-#if GENERIC
-    generic_port_range_type range[] = {
-#if 1
-      // Make the DMA controller invisible
-
-      {0x00, 0x07, GENERIC_PRINT_AND_IGNORE},   // DMA 1 channels 0,1,2,3 (address, counter)
-      {0xc0, 0xc7, GENERIC_PRINT_AND_IGNORE},   // DMA 2 channels 4,5,6,7 (address, counter)
-      {0x87, 0x87, GENERIC_PRINT_AND_IGNORE},   // DMA 1 channel 0 page register
-      {0x83, 0x83, GENERIC_PRINT_AND_IGNORE},   // DMA 1 channel 1 page register
-      {0x81, 0x81, GENERIC_PRINT_AND_IGNORE},   // DMA 1 channel 2 page register
-      {0x82, 0x82, GENERIC_PRINT_AND_IGNORE},   // DMA 1 channel 3 page register
-      {0x8f, 0x8f, GENERIC_PRINT_AND_IGNORE},   // DMA 2 channel 4 page register
-      {0x8b, 0x8b, GENERIC_PRINT_AND_IGNORE},   // DMA 2 channel 5 page register
-      {0x89, 0x89, GENERIC_PRINT_AND_IGNORE},   // DMA 2 channel 6 page register
-      {0x8a, 0x8a, GENERIC_PRINT_AND_IGNORE},   // DMA 2 channel 7 page register
-      {0x08, 0x0f, GENERIC_PRINT_AND_IGNORE},   // DMA 1 misc registers (csr, req, smask,mode,clearff,reset,enable,mmask)
-      {0xd0, 0xde, GENERIC_PRINT_AND_IGNORE},   // DMA 2 misc registers
-#endif
-      
+    xml_len = *(uint32_t *)(cfg_blob + offset);
+    offset += 4;
 
-#if 1      
-      // Make the Serial ports invisible 
+    cfg->cfg = (v3_cfg_tree_t *)v3_xml_parse((uint8_t *)(cfg_blob + offset));
+    offset += xml_len;
+   
+    offset += 8;
 
-      {0x3f8, 0x3f8+7, GENERIC_PRINT_AND_IGNORE},      // COM 1
-      {0x2f8, 0x2f8+7, GENERIC_PRINT_AND_IGNORE},      // COM 2
+    files = (struct file_idx_table *)(cfg_blob + offset);
 
-#endif
+    V3_Print("Number of files in cfg: %d\n", (uint32_t)(files->num_files));
 
-#ifndef DEBUG_RAMDISK
+    file_tree = v3_cfg_subtree(v3_cfg_subtree(cfg->cfg, "files"), "file");
 
-      {0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE},      // COM 3
-      {0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE},      // COM 4
-#endif
+    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;
+       }
 
-#if 1
-      // Make the PCI bus invisible (at least it's configuration)
 
-      {0xcf8, 0xcf8, GENERIC_PRINT_AND_IGNORE}, // PCI Config Address
-      {0xcfc, 0xcfc, GENERIC_PRINT_AND_IGNORE}, // PCI Config Data
-#endif
+       V3_Print("File index=%d id=%s\n", idx, id);
 
-#ifndef RAMDISK_BOOT
+       strncpy(file->tag, id, 256);
+       file->size = hdr->size;
+       file->data = cfg_blob + hdr->offset;
 
-      // Monitor the IDE controllers (very slow)
+       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));
 
-      {0x170, 0x178, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 1
-      {0x376, 0x377, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 1
+       V3_Print("Keying file to name\n");
+       v3_htable_insert(cfg->file_table, (addr_t)(file->tag), (addr_t)(file));
 
-#endif
+       V3_Print("Iterating to next file\n");
 
-#if 1
-      {0x1f0, 0x1f8, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 0
-      {0x3f6, 0x3f7, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 0
-#endif
-      
+       file_tree = v3_cfg_next_branch(file_tree);
+    }
 
-#if 0
+    V3_Print("Configuration parsed successfully\n");
 
-      // Make the floppy controllers invisible
+    return cfg;
+}
 
-      {0x3f0, 0x3f2, GENERIC_PRINT_AND_IGNORE}, // Primary floppy controller (base,statusa/statusb,DOR)
-      {0x3f4, 0x3f5, GENERIC_PRINT_AND_IGNORE}, // Primary floppy controller (mainstat/datarate,data)
-      {0x3f7, 0x3f7, GENERIC_PRINT_AND_IGNORE}, // Primary floppy controller (DIR)
-      {0x370, 0x372, GENERIC_PRINT_AND_IGNORE}, // Secondary floppy controller (base,statusa/statusb,DOR)
-      {0x374, 0x375, GENERIC_PRINT_AND_IGNORE}, // Secondary floppy controller (mainstat/datarate,data)
-      {0x377, 0x377, GENERIC_PRINT_AND_IGNORE}, // Secondary floppy controller (DIR)
-      
-#endif
+static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
+    v3_cpu_arch_t cpu_type = v3_get_cpu_type(v3_get_cpu_id());
+
+    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");
+    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);
 
-#if 1
+    // Amount of ram the Guest will have, always in MB
+    vm->mem_size = atoi(memory_str) * 1024 * 1024;
+    
+    if (strcasecmp(vm_class, "PC") == 0) {
+       vm->vm_class = V3_PC_VM;
+    } else {
+       PrintError("Invalid VM class\n");
+       return -1;
+    }
 
-      // Make the parallel port invisible
-      
-      {0x378, 0x37f, GENERIC_PRINT_AND_IGNORE},
+#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 1
-
-      // Monitor graphics card operations
+    v3_init_hypercall_map(vm);
+    v3_init_io_map(vm);
+    v3_init_msr_map(vm);
+    v3_init_cpuid_map(vm);
+    v3_init_host_events(vm);
+    v3_init_intr_routers(vm);
+
+    // Initialize the memory map
+    if (v3_init_mem_map(vm) == -1) {
+       PrintError("Could not initialize shadow map\n");
+       return -1;
+    }
 
-      {0x3b0, 0x3bb, GENERIC_PRINT_AND_PASSTHROUGH},
-      {0x3c0, 0x3df, GENERIC_PRINT_AND_PASSTHROUGH},
-      
+#ifdef CONFIG_SYMBIOTIC
+    v3_init_sym_iface(vm);
 #endif
 
+    v3_init_dev_mgr(vm);
 
-#if 1
-      // Make the ISA PNP features invisible
 
-      {0x274, 0x277, GENERIC_PRINT_AND_IGNORE},
-      {0x279, 0x279, GENERIC_PRINT_AND_IGNORE},
-      {0xa79, 0xa79, GENERIC_PRINT_AND_IGNORE},
+#ifdef CONFIG_SYMBIOTIC_SWAP
+    PrintDebug("initializing symbiotic swap\n");
+    v3_init_sym_swap(vm);
 #endif
 
 
-#if 1
-      // Monitor any network card (realtek ne2000) operations 
-      {0xc100, 0xc1ff, GENERIC_PRINT_AND_PASSTHROUGH},
+       // init SVM/VMX
+#ifdef CONFIG_SVM
+       if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) {
+           v3_init_svm_io_map(vm);
+           v3_init_svm_msr_map(vm);
+       }
 #endif
-
-
-#if 1
-      // Make any Bus master ide controller invisible
-      
-      {0xc000, 0xc00f, GENERIC_PRINT_AND_IGNORE},
+#ifdef CONFIG_VMX
+       else if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) {
+           v3_init_vmx_io_map(vm);
+           v3_init_vmx_msr_map(vm);
+       }
 #endif
+       else {
+           PrintError("Invalid CPU Type\n");
+           return -1;
+       }
 
+   if (schedule_hz_str) {
+       sched_hz = atoi(schedule_hz_str);
+    }
 
-      //         {0x378, 0x400, GENERIC_PRINT_AND_IGNORE}
-      
-      {0,0,0},  // sentinal - must be last
-      
-    };
-    
+    PrintDebug("CPU_KHZ = %d, schedule_freq=%p\n", V3_CPU_KHZ(), 
+              (void *)(addr_t)sched_hz);
 
-    struct vm_device * generic = create_generic(range, NULL, NULL);
+    vm->yield_cycle_period = (V3_CPU_KHZ() * 1000) / sched_hz;
     
+    return 0;
+}
+
+static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
+    extern v3_cpu_arch_t v3_cpu_types[];
+    char * paging = v3_cfg_val(core_cfg, "paging");
+
+    /*
+     * Initialize the subsystem data strutures
+     */
+#ifdef CONFIG_TELEMETRY
+    if (info->vm_info->enable_telemetry) {
+       v3_init_telemetry(info);
+    }
 #endif
+
     
-    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);
-
-//Zheng 09/29/2008    
-#ifdef RAMDISK_BOOT
-    v3_attach_device(info, ramdisk);
-#endif
+    if ((v3_cpu_types[info->cpu_id] == V3_SVM_REV3_CPU) && 
+       (paging) && (strcasecmp(paging, "nested") == 0)) {
+       PrintDebug("Guest Page Mode: NESTED_PAGING\n");
+       info->shdw_pg_mode = NESTED_PAGING;
+    } else {
+       PrintDebug("Guest Page Mode: SHADOW_PAGING\n");
+       v3_init_shadow_page_state(info);
+       info->shdw_pg_mode = SHADOW_PAGING;
+    }
+
+
 
-#if GENERIC
-    // Important that this be attached last!
-    v3_attach_device(info, generic);
+    v3_init_time(info);
+    v3_init_intr_controllers(info);
+    v3_init_exception_state(info);
+
+    v3_init_decoder(info);
     
-#endif
+
+
+    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) {
     
-    PrintDebugDevMgr(info);
-  }
-  
-  // give keyboard interrupts to vm
-  // no longer needed since we have a keyboard device
-  //hook_irq(&vm_info, 1);
-  
-#if 1
-  // give floppy controller to vm
-  v3_hook_irq_for_guest_injection(info, 6);
-#endif
-  
-#if 1
-  //primary ide
-  v3_hook_irq_for_guest_injection(info, 14);
-  
-#endif
+    vm->run_state = VM_STOPPED;
 
-#ifndef RAMDISK_BOOT
-  // secondary ide
-  v3_hook_irq_for_guest_injection(info, 15);
-#endif
+    // 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_hook_io_port(info, 1234, &IO_Read, NULL, info);
 
-  info->rip = 0xfff0;
-  info->vm_regs.rsp = 0x0;
-  
+    //    v3_print_io_map(info);
+    v3_print_msr_map(vm);
+
+
+    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;
+    }
 
-  return 0;
+    return 0;
 }
 
 
 
+static int post_config_core(struct guest_info * info, v3_cfg_tree_t * cfg) {
 
 
+    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;
+    }
 
 
+    return 0;
+}
 
 
 
+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);
 
+    memset(vm, 0, guest_state_size);
 
+    vm->num_cores = num_cores;
 
+    return vm;
+}
 
 
 
+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;
+    }
 
-#if 0
+    num_cores = atoi(v3_cfg_val(cores_cfg, "count"));
 
-    
-    if (0) {
-      
-      //    add_shared_mem_range(&(vm_info.mem_layout), 0, 0x800000, 0x10000);    
-      //    add_shared_mem_range(&(vm_info.mem_layout), 0, 0x1000000, 0);
-      
-      rip = (ulong_t)(void*)&BuzzVM;
-      //  rip -= 0x10000;
-      //    rip = (addr_t)(void*)&exit_test;
-      //  rip -= 0x2000;
-      vm_info.rip = rip;
-      rsp = (addr_t)Alloc_Page();
-      
-      vm_info.vm_regs.rsp = (rsp +4092 );// - 0x2000;
-      
-            
-    } else if (0) {
-      //add_shared_mem_range(&(vm_info.mem_layout), 0x0, 0x1000, 0x100000);
-      //      add_shared_mem_range(&(vm_info.mem_layout), 0x0, 0x100000, 0x0);
-      
-      /*
-       shadow_region_t *ent = Malloc(sizeof(shadow_region_t));;
-       init_shadow_region_physical(ent,0,0x100000,GUEST_REGION_PHYSICAL_MEMORY,
-       0x100000, HOST_REGION_PHYSICAL_MEMORY);
-       add_shadow_region(&(vm_info.mem_map),ent);
-      */
-
-      add_shadow_region_passthrough(&vm_info, 0x0, 0x100000, 0x100000);
-
-      v3_hook_io_port(&vm_info, 0x61, &IO_Read, &IO_Write, NULL);
-      v3_hook_io_port(&vm_info, 0x05, &IO_Read, &IO_Write_to_Serial, NULL);
-      
-
-
-      /*
-       vm_info.cr0 = 0;
-       vm_info.cs.base=0xf000;
-       vm_info.cs.limit=0xffff;
-      */
-      //vm_info.rip = 0xfff0;
-
-      vm_info.rip = 0;
-      vm_info.vm_regs.rsp = 0x0;
-    } else {
-   
+    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;
+
+       pre_config_core(info, per_core_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, vm->vm_class) == -1) {
+               PrintError("Error in SVM initialization\n");
+               return NULL;
+           }
+       }
+#endif
+#ifdef CONFIG_VMX
+       else if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) {
+           if (v3_init_vmx_vmcs(info, vm->vm_class) == -1) {
+               PrintError("Error in VMX initialization\n");
+               return NULL;
+           }
+       }
 #endif
+       else {
+           PrintError("Invalid CPU Type\n");
+           return NULL;
+       }
+       
+       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, 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 * id = v3_cfg_val(device, "id");
+
+       V3_Print("configuring device %s\n", id);
+
+       if (v3_create_device(vm, id, device) == -1) {
+           PrintError("Error creating device %s\n", id);
+           return -1;
+       }
+       
+       device = v3_cfg_next_branch(device);
+    }
+
+    v3_print_dev_mgr(vm);
+
+    return 0;
+}
+
+
+
+