X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=22ab61187fdd42ea3bad43446d115eee43470b85;hb=0aed29b0f8c93d2bef57d589e8bf058445e89fc2;hp=5bfe537350a43e5a4deef2bba5f550eabd602ac7;hpb=e23a867d9dcecc70fc76adc0f89404dbc50e5b78;p=palacios.git diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index 5bfe537..22ab611 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -22,426 +22,540 @@ #include #include #include -#include +#include #include #include #include +#include +#include +#include +#include +#include + + -#include -#include -#include -#include -#include -#include #include +#include -#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; +}; -#include +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 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_devices(struct v3_vm_info * vm, v3_cfg_tree_t * cfg); -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); - - 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; +} + +v3_cfg_tree_t * v3_cfg_subtree(v3_cfg_tree_t * tree, char * tag) { + return v3_xml_child(tree, tag); +} + +v3_cfg_tree_t * v3_cfg_next_branch(v3_cfg_tree_t * tree) { + return v3_xml_next(tree); +} + + + +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 * files = NULL; + v3_cfg_tree_t * file_tree = NULL; + + V3_Print("cfg data at %p\n", cfg_blob); + + if (memcmp(cfg_blob, "v3vee\0\0\0", 8) != 0) { + PrintError("Invalid Configuration Header\n"); + return NULL; + } + + offset += 8; + + cfg = (struct v3_config *)V3_Malloc(sizeof(struct v3_config)); + memset(cfg, 0, sizeof(struct v3_config)); + + cfg->blob = cfg_blob; + INIT_LIST_HEAD(&(cfg->file_list)); + cfg->file_table = v3_create_htable(0, file_hash_fn, file_eq_fn); + + xml_len = *(uint32_t *)(cfg_blob + offset); + offset += 4; + + cfg->cfg = (v3_cfg_tree_t *)v3_xml_parse((uint8_t *)(cfg_blob + offset)); + offset += xml_len; + + offset += 8; + + files = (struct file_idx_table *)(cfg_blob + offset); + + V3_Print("Number of files in cfg: %d\n", (uint32_t)(files->num_files)); -int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) { - extern v3_cpu_arch_t v3_cpu_type; + file_tree = v3_cfg_subtree(v3_cfg_subtree(cfg->cfg, "files"), "file"); + + while (file_tree) { + char * id = v3_cfg_val(file_tree, "id"); + char * index = v3_cfg_val(file_tree, "index"); + int idx = atoi(index); + struct file_hdr * hdr = &(files->hdrs[idx]); + struct v3_cfg_file * file = NULL; + + file = (struct v3_cfg_file *)V3_Malloc(sizeof(struct v3_cfg_file)); + + if (!file) { + PrintError("Could not allocate file structure\n"); + return NULL; + } + + + V3_Print("File index=%d id=%s\n", idx, id); + + strncpy(file->tag, id, 256); + file->size = hdr->size; + file->data = cfg_blob + hdr->offset; + + V3_Print("Storing file data offset = %d, size=%d\n", (uint32_t)hdr->offset, hdr->size); + V3_Print("file data at %p\n", file->data); + list_add( &(file->file_node), &(cfg->file_list)); + + V3_Print("Keying file to name\n"); + v3_htable_insert(cfg->file_table, (addr_t)(file->tag), (addr_t)(file)); + + V3_Print("Iterating to next file\n"); + + file_tree = v3_cfg_next_branch(file_tree); + } - // Amount of ram the Guest will have, rounded to a 4K page boundary - info->mem_size = config_ptr->mem_size & ~(addr_t)0xfff; + V3_Print("Configuration parsed successfully\n"); + return cfg; +} - // Initialize the subsystem data strutures - v3_init_time(info); - v3_init_io_map(info); - v3_init_msr_map(info); - v3_init_interrupt_state(info); - v3_init_exception_state(info); - v3_init_dev_mgr(info); - v3_init_host_events(info); +static inline uint32_t get_alignment(char * align_str) { + // default is 4KB alignment + uint32_t alignment = PAGE_SIZE_4KB; - v3_init_decoder(info); + 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; + } + } - v3_init_hypercall_map(info); +#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) { - // Initialize the memory map - v3_init_shadow_map(info); + 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 ((v3_cpu_type == V3_SVM_REV3_CPU) && - (config_ptr->enable_nested_paging == 1)) { - PrintDebug("Guest Page Mode: NESTED_PAGING\n"); - info->shdw_pg_mode = NESTED_PAGING; + if (!memory_str) { + PrintError("Memory is a required configuration parameter\n"); + return -1; + } + + PrintDebug("Memory=%s\n", memory_str); + if (align_str) { + PrintDebug("Alignment=%s\n", align_str); } else { - PrintDebug("Guest Page Mode: SHADOW_PAGING\n"); - v3_init_shadow_page_state(info); - info->shdw_pg_mode = SHADOW_PAGING; + PrintDebug("Alignment defaulted to 4KB.\n"); } - if (config_ptr->enable_profiling) { - info->enable_profiler = 1; - v3_init_profiler(info); + // 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); + + PrintDebug("Alignment computed as 0x%x\n", vm->mem_align); + + if (strcasecmp(vm_class, "PC") == 0) { + vm->vm_class = V3_PC_VM; } else { - info->enable_profiler = 0; + PrintError("Invalid VM class\n"); + return -1; + } + + +#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 (config_ptr->schedule_freq == 0) { - // set the schedule frequency to 100 HZ - config_ptr->schedule_freq = 100; + + + if (schedule_hz_str) { + sched_hz = atoi(schedule_hz_str); } - PrintDebug("CPU_KHZ = %d, schedule_freq=%p\n", V3_CPU_KHZ(), (void *)config_ptr->schedule_freq); + PrintDebug("CPU_KHZ = %d, schedule_freq=%p\n", V3_CPU_KHZ(), + (void *)(addr_t)sched_hz); + + 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_cpu_types[]; - info->yield_cycle_period = (V3_CPU_KHZ() * 1000) / config_ptr->schedule_freq; + 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"); - // Initial CPU operating mode - info->cpu_mode = REAL; - info->mem_mode = PHYSICAL_MEM; + 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 mode specified in configuration.\n"); + info->shdw_pg_mode = SHADOW_PAGING; + } + if (info->shdw_pg_mode == NESTED_PAGING) { + PrintDebug("Guest Paging Mode: NESTED_PAGING\n"); + } 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; + } 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); -int v3_post_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) { + 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) { + + vm->run_state = VM_STOPPED; // Configure the memory map for the guest - if (setup_memory_map(info, config_ptr) == -1) { + 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(info, config_ptr) == -1) { + if (setup_devices(vm, cfg) == -1) { PrintError("Failed to setup devices\n"); return -1; } - info->run_state = VM_STOPPED; - info->vm_regs.rdi = 0; - info->vm_regs.rsi = 0; - info->vm_regs.rbp = 0; - info->vm_regs.rsp = 0; - info->vm_regs.rbx = 0; - info->vm_regs.rdx = 0; - info->vm_regs.rcx = 0; - info->vm_regs.rax = 0; + // 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; + } + + if (v3_inject_mptable(vm)==-1) { + PrintError("Failed to inject mptable during configuration\n"); + return -1; + } return 0; } +static int post_config_core(struct guest_info * info, v3_cfg_tree_t * cfg) { -/* TODO: - * The amount of guest memory is stored in info->mem_size - * We need to make sure the memory map extends to cover it - */ -static int setup_memory_map(struct guest_info * info, struct v3_vm_config * config_ptr) { - PrintDebug("Setting up memory map (memory size=%dMB)\n", (uint_t)(info->mem_size / (1024 * 1024))); - - // VGA frame buffer - if (1) { - if (v3_add_shadow_mem(info, 0xa0000, 0xc0000, 0xa0000) == -1) { - PrintError("Could not map VGA framebuffer\n"); + + 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 { - v3_hook_write_mem(info, 0xa0000, 0xc0000, 0xa0000, passthrough_mem_write, NULL); + PrintError("Invalid VM Class\n"); + return -1; } -#define VGABIOS_START 0x000c0000 -#define ROMBIOS_START 0x000f0000 - /* layout vgabios */ - { - addr_t vgabios_dst = v3_get_shadow_addr(&(info->mem_map.base_region), VGABIOS_START); - memcpy(V3_VAddr((void *)vgabios_dst), config_ptr->vgabios, config_ptr->vgabios_size); - } - - /* layout rombios */ - { - addr_t rombios_dst = v3_get_shadow_addr(&(info->mem_map.base_region), ROMBIOS_START); - memcpy(V3_VAddr((void *)rombios_dst), config_ptr->rombios, config_ptr->rombios_size); - } + return 0; +} -#ifdef CRAY_XT - { -#define SEASTAR_START 0xffe00000 -#define SEASTAR_END 0xffffffff - // Map the Seastar straight through - if (v3_add_shadow_mem(info, SEASTAR_START, SEASTAR_END, SEASTAR_START) == -1) { - PrintError("Could not map through the seastar\n"); - return -1; - } - } -#endif - print_shadow_map(info); - return 0; +static 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; } -static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) { +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; - v3_create_device(info, "8259A", NULL); - v3_create_device(info, "KEYBOARD", NULL); - v3_create_device(info, "8254_PIT", NULL); - v3_create_device(info, "BOCHS_DEBUG", NULL); - v3_create_device(info, "OS_DEBUG", NULL); - v3_create_device(info, "LAPIC", NULL); - v3_create_device(info, "IOAPIC", "LAPIC"); - v3_create_device(info, "VMNET", NULL); - - int use_generic = USE_GENERIC; + if (cpu_type == V3_INVALID_CPU) { + PrintError("Configuring guest on invalid CPU\n"); + return NULL; + } - if (config_ptr->enable_pci == 1) { - struct ide_cfg ide_config = {"PCI", "PIIX3"}; - - v3_create_device(info, "PCI", NULL); - v3_create_device(info, "i440FX", "PCI"); - v3_create_device(info, "PIIX3", "PCI"); - + cfg_data = parse_config(cfg_blob); + + if (!cfg_data) { + PrintError("Could not parse configuration\n"); + return NULL; + } - 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"); + cores_cfg = v3_cfg_subtree(cfg_data->cfg, "cores"); - v3_create_device(info, "IDE", &ide_config); - } else { - v3_create_device(info, "IDE", NULL); + 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 (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}; + if (num_cores == 0) { + PrintError("No cores specified in configuration\n"); + return NULL; + } - PrintDebug("Creating RAM CD\n"); + V3_Print("Configuring %d cores\n", 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"); + vm = allocate_guest(num_cores); - v3_create_device(info, "NET-CD", &cfg); - } - } else if (config_ptr->pri_disk_type == HARDDRIVE) { - if (config_ptr->pri_disk_con == RAM) { - struct ram_hd_cfg cfg = {"IDE", 0, 0, - (addr_t)(config_ptr->pri_disk_info.ram.data_ptr), - config_ptr->pri_disk_info.ram.size}; - - PrintDebug("Creating RAM HD\n"); - - v3_create_device(info, "RAM-HD", &cfg); - } else if (config_ptr->pri_disk_con == NETWORK) { - struct net_hd_cfg cfg = {"IDE", 0, 0, - config_ptr->pri_disk_info.net.ip_str, - config_ptr->pri_disk_info.net.port, - config_ptr->pri_disk_info.net.disk_name}; - PrintDebug("Creating NET HD\n"); - v3_create_device(info, "NET-HD", &cfg); - } - } + if (!vm) { + PrintError("Could not allocate %d core guest\n", vm->num_cores); + return NULL; } + vm->cfg_data = cfg_data; + V3_Print("Preconfiguration\n"); - if (config_ptr->sec_disk_type != NONE) { - if (config_ptr->sec_disk_type == CDROM) { - if (config_ptr->sec_disk_con == RAM) { - struct ram_cd_cfg cfg = {"IDE", 0, 1, - (addr_t)(config_ptr->sec_disk_info.ram.data_ptr), - config_ptr->sec_disk_info.ram.size}; + if (pre_config_vm(vm, vm->cfg_data->cfg) == -1) { + PrintError("Error in preconfiguration\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); - } + 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; } + + per_core_cfg = v3_cfg_next_branch(per_core_cfg); } + V3_Print("Post Configuration\n"); - if (use_generic) { - configure_generic(info, config_ptr); + if (post_config_vm(vm, vm->cfg_data->cfg) == -1) { + PrintError("Error in postconfiguration\n"); + return NULL; } - // This should go last because it requires information about the Harddrives - v3_create_device(info, "NVRAM", "IDE"); - - PrintDebugDevMgr(info); - return 0; -} + 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); + } -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("Configuration successfull\n"); - struct vm_device * generic = v3_find_dev(info, "GENERIC"); + return vm; +} - if (!generic) { - PrintError("Could not find generic device\n"); - return -1; - } - // port 0x92: A20 enable/disable (bit 2) (This causes an MMU flush) - - - // Make the DMA controller invisible - v3_generic_add_port_range(generic, 0x00, 0x07, GENERIC_PRINT_AND_IGNORE); // DMA 1 channels 0,1,2,3 (address, counter) - v3_generic_add_port_range(generic, 0xc0, 0xc7, GENERIC_PRINT_AND_IGNORE); // DMA 2 channels 4,5,6,7 (address, counter) - v3_generic_add_port_range(generic, 0x87, 0x87, GENERIC_PRINT_AND_IGNORE); // DMA 1 channel 0 page register - v3_generic_add_port_range(generic, 0x83, 0x83, GENERIC_PRINT_AND_IGNORE); // DMA 1 channel 1 page register - v3_generic_add_port_range(generic, 0x81, 0x81, GENERIC_PRINT_AND_IGNORE); // DMA 1 channel 2 page register - v3_generic_add_port_range(generic, 0x82, 0x82, GENERIC_PRINT_AND_IGNORE); // DMA 1 channel 3 page register - v3_generic_add_port_range(generic, 0x8f, 0x8f, GENERIC_PRINT_AND_IGNORE); // DMA 2 channel 4 page register - v3_generic_add_port_range(generic, 0x8b, 0x8b, GENERIC_PRINT_AND_IGNORE); // DMA 2 channel 5 page register - v3_generic_add_port_range(generic, 0x89, 0x89, GENERIC_PRINT_AND_IGNORE); // DMA 2 channel 6 page register - v3_generic_add_port_range(generic, 0x8a, 0x8a, GENERIC_PRINT_AND_IGNORE); // DMA 2 channel 7 page register - v3_generic_add_port_range(generic, 0x08, 0x0f, GENERIC_PRINT_AND_IGNORE); // DMA 1 misc registers (csr, req, smask,mode,clearff,reset,enable,mmask) - v3_generic_add_port_range(generic, 0xd0, 0xde, GENERIC_PRINT_AND_IGNORE); // DMA 2 misc registers - - - - - // Make the Serial ports invisible - - v3_generic_add_port_range(generic, 0x3f8, 0x3f8+7, GENERIC_PRINT_AND_IGNORE); // COM 1 - v3_generic_add_port_range(generic, 0x2f8, 0x2f8+7, GENERIC_PRINT_AND_IGNORE); // COM 2 - - - v3_generic_add_port_range(generic, 0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE); // COM 3 - v3_generic_add_port_range(generic, 0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE); // COM 4 - - +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"); - // 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 - } - + 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, 0x1f0, 0x1f8, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 0 - v3_generic_add_port_range(generic, 0x3f6, 0x3f7, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 0 -#endif - - -#if 0 - // Make the floppy controllers invisible - - v3_generic_add_port_range(generic, 0x3f0, 0x3f2, GENERIC_PRINT_AND_IGNORE); // Primary floppy controller (base,statusa/statusb,DOR) - v3_generic_add_port_range(generic, 0x3f4, 0x3f5, GENERIC_PRINT_AND_IGNORE); // Primary floppy controller (mainstat/datarate,data) - v3_generic_add_port_range(generic, 0x3f7, 0x3f7, GENERIC_PRINT_AND_IGNORE); // Primary floppy controller (DIR) - v3_generic_add_port_range(generic, 0x370, 0x372, GENERIC_PRINT_AND_IGNORE); // Secondary floppy controller (base,statusa/statusb,DOR) - v3_generic_add_port_range(generic, 0x374, 0x375, GENERIC_PRINT_AND_IGNORE); // Secondary floppy controller (mainstat/datarate,data) - v3_generic_add_port_range(generic, 0x377, 0x377, GENERIC_PRINT_AND_IGNORE); // Secondary floppy controller (DIR) - -#endif + if (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; + } -#if 1 + mem_region = v3_cfg_next_branch(mem_region); + } - // Make the parallel port invisible - - v3_generic_add_port_range(generic, 0x378, 0x37f, GENERIC_PRINT_AND_IGNORE); + return 0; +} -#endif -#if 1 - // Monitor graphics card operations - - v3_generic_add_port_range(generic, 0x3b0, 0x3bb, GENERIC_PRINT_AND_PASSTHROUGH); - v3_generic_add_port_range(generic, 0x3c0, 0x3df, GENERIC_PRINT_AND_PASSTHROUGH); - -#endif +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"); -#if 1 - // Make the ISA PNP features invisible - v3_generic_add_port_range(generic, 0x274, 0x277, GENERIC_PRINT_AND_IGNORE); - v3_generic_add_port_range(generic, 0x279, 0x279, GENERIC_PRINT_AND_IGNORE); - v3_generic_add_port_range(generic, 0xa79, 0xa79, GENERIC_PRINT_AND_IGNORE); -#endif + while (device) { + char * id = v3_cfg_val(device, "id"); + V3_Print("configuring device %s\n", id); -#if 1 - // Monitor any network card (realtek ne2000) operations - v3_generic_add_port_range(generic, 0xc100, 0xc1ff, GENERIC_PRINT_AND_PASSTHROUGH); -#endif + 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); - // v3_generic_add_port_range(generic, 0x378, 0x400, GENERIC_PRINT_AND_IGNORE); - return 0; } + + + +