X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=81a37d3ca3ecd6234ed61cbfe9fc22c5b171c3da;hp=75e783413ca340f85e9ef92e76105742f02992c6;hb=68521eca0f94f8c22aa60e762c83e24beec7233c;hpb=4659d019e2f65b9397e2289a9add28a3adf47cf8 diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index 75e7834..81a37d3 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -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. @@ -22,75 +22,229 @@ #include #include #include -#include +#include #include #include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#ifdef CONFIG_SYMBIOTIC +#include +#ifdef CONFIG_SYMBIOTIC_SWAP +#include +#endif + +#endif #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; +}; +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 guest_info * info, struct v3_config * config_ptr); +static int setup_devices(struct guest_info * info, struct v3_config * config_ptr); +char * v3_cfg_val(v3_cfg_tree_t * tree, char * tag) { + char * attrib = (char *)v3_xml_attr(tree, tag); + v3_cfg_tree_t * child_entry = v3_xml_child(tree, tag); + char * val = NULL; -static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) { + if ((child_entry != NULL) && (attrib != NULL)) { + PrintError("Duplicate Configuration parameters present for %s\n", tag); + return NULL; + } - return length; - // memcpy((void*)guest_addr, src, length); - PrintDebug("Write of %d bytes to %p\n", length, (void *)guest_addr); - PrintDebug("Write Value = %p\n", (void *)*(addr_t *)src); - - return length; + 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); +} -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_io_map(info); - v3_init_msr_map(info); - v3_init_interrupt_state(info); - v3_init_dev_mgr(info); - v3_init_host_events(info); + +struct v3_cfg_file * v3_cfg_get_file(struct guest_info * info, char * tag) { + struct v3_cfg_file * file = NULL; + + file = (struct v3_cfg_file *)v3_htable_search(info->cfg_data->file_table, (addr_t)tag); + + 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); - v3_init_decoder(info); + xml_len = *(uint32_t *)(cfg_blob + offset); + offset += 4; + + cfg->cfg = (v3_cfg_tree_t *)v3_xml_parse((uint8_t *)(cfg_blob + offset)); + offset += xml_len; + + offset += 8; + + files = (struct file_idx_table *)(cfg_blob + offset); + + V3_Print("Number of files in cfg: %d\n", (uint32_t)(files->num_files)); + + file_tree = v3_cfg_subtree(v3_cfg_subtree(cfg->cfg, "files"), "file"); + + while (file_tree) { + char * id = v3_cfg_val(file_tree, "id"); + char * index = v3_cfg_val(file_tree, "index"); + int idx = atoi(index); + struct file_hdr * hdr = &(files->hdrs[idx]); + struct v3_cfg_file * file = NULL; + + file = (struct v3_cfg_file *)V3_Malloc(sizeof(struct v3_cfg_file)); + + if (!file) { + PrintError("Could not allocate file structure\n"); + return NULL; + } + + + V3_Print("File index=%d id=%s\n", idx, id); + + strncpy(file->tag, id, 256); + file->size = hdr->size; + file->data = cfg_blob + hdr->offset; + + V3_Print("Storing file data offset = %d, size=%d\n", (uint32_t)hdr->offset, hdr->size); + V3_Print("file data at %p\n", file->data); + list_add( &(file->file_node), &(cfg->file_list)); + + V3_Print("Keying file to name\n"); + v3_htable_insert(cfg->file_table, (addr_t)(file->tag), (addr_t)(file)); + + V3_Print("Iterating to next file\n"); + + file_tree = v3_cfg_next_branch(file_tree); + } + + V3_Print("Configuration parsed successfully\n"); + + return cfg; +} + + +static int pre_config_guest(struct guest_info * info, struct v3_config * config_ptr) { + extern v3_cpu_arch_t v3_cpu_types[]; + char * memory_str = v3_cfg_val(config_ptr->cfg, "memory"); + char * paging = v3_cfg_val(config_ptr->cfg, "paging"); + char * schedule_hz_str = v3_cfg_val(config_ptr->cfg, "schedule_hz"); + char * vm_class = v3_cfg_val(config_ptr->cfg, "class"); + uint32_t sched_hz = 100; // set the schedule frequency to 100 HZ - v3_init_shadow_map(info); + if (!memory_str) { + PrintError("Memory is a required configuration parameter\n"); + return -1; + } + PrintDebug("Memory=%s\n", memory_str); + + // Amount of ram the Guest will have, always in MB + info->mem_size = atoi(memory_str) * 1024 * 1024; + + if (strcasecmp(vm_class, "PC") == 0) { + info->vm_class = V3_PC_VM; + } else { + PrintError("Invalid VM class\n"); + return -1; + } + + + /* + * Initialize the subsystem data strutures + */ +#ifdef CONFIG_TELEMETRY + { + char * telemetry = v3_cfg_val(config_ptr->cfg, "telemetry"); + + // This should go first, because other subsystems will depend on the guest_info flag + if ((telemetry) && (strcasecmp(telemetry, "enable") == 0)) { + info->enable_telemetry = 1; + v3_init_telemetry(info); + } else { + info->enable_telemetry = 0; + } + } +#endif + v3_init_hypercall_map(info); + v3_init_io_map(info); + v3_init_msr_map(info); + v3_init_cpuid_map(info); + v3_init_host_events(info); + + // Initialize the memory map + if (v3_init_shadow_map(info) == -1) { + PrintError("Could not initialize shadow map\n"); + return -1; + } - if ((v3_cpu_type == V3_SVM_REV3_CPU) && - (config_ptr->enable_nested_paging == 1)) { + 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 { @@ -98,392 +252,193 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) 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; - - // Amount of ram the Guest will have, rounded to a 4K page boundary - info->mem_size = config_ptr->mem_size & ~(addr_t)0xfff; - - // Configure the memory map for the guest - if (setup_memory_map(info, config_ptr) == -1) { - PrintError("Setting up guest memory map failed...\n"); - return -1; - } - - // Configure the devices for the guest - setup_devices(info, config_ptr); - - - if (config_ptr->enable_profiling) { - info->enable_profiler = 1; - v3_init_profiler(info); - } else { - info->enable_profiler = 0; - } +#ifdef CONFIG_SYMBIOTIC + v3_init_sym_iface(info); +#endif - //v3_hook_io_port(info, 1234, &IO_Read, NULL, info); - - // Setup initial cpu register state - info->rip = 0xfff0; - info->vm_regs.rsp = 0x0; - + v3_init_time(info); + v3_init_interrupt_state(info); + v3_init_exception_state(info); + v3_init_dev_mgr(info); + v3_init_decoder(info); - return 0; -} +#ifdef CONFIG_SYMBIOTIC_SWAP + PrintDebug("initializing symbiotic swap\n"); + v3_init_sym_swap(info); +#endif + if (schedule_hz_str) { + sched_hz = atoi(schedule_hz_str); + } -/* 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) { - addr_t mem_pages = info->mem_size >> 12; - - PrintDebug("Setting up memory map (memory size=%dMB)\n", (uint_t)(info->mem_size / (1024 * 1024))); + PrintDebug("CPU_KHZ = %d, schedule_freq=%p\n", V3_CPU_KHZ(), + (void *)(addr_t)sched_hz); + + info->yield_cycle_period = (V3_CPU_KHZ() * 1000) / sched_hz; - // Fill up to the 640K hole - if (mem_pages >= 160) { - if (v3_add_shadow_mem(info, 0x0, 0xa0000, (addr_t)V3_AllocPages(160)) == -1) { - PrintError("Could not map full conventional memory\n"); + if (info->vm_class == V3_PC_VM) { + if (pre_config_pc(info, config_ptr) == -1) { + PrintError("PC Post configuration failure\n"); return -1; } } else { - // Less than 640k of memory - if (v3_add_shadow_mem(info, 0x0, (mem_pages * PAGE_SIZE), (addr_t)V3_AllocPages(mem_pages)) == -1) { - PrintError("Could not map subset of conventional memory\n"); - return -1; - }; + PrintError("Invalid VM Class\n"); + return -1; } + return 0; +} -#define VGABIOS_START 0x000c0000 -#define ROMBIOS_START 0x000f0000 - - // VGA frame buffer - if (1) { - if (v3_add_shadow_mem(info, 0xa0000, 0xc0000, 0xa0000) == -1) { - PrintError("Could not map VGA framebuffer\n"); - return -1; - } - } else { - v3_hook_write_mem(info, 0xa0000, 0xc0000, 0xa0000, passthrough_mem_write, NULL); - } - - - /* layout vgabios */ - { - uint_t num_pages = (config_ptr->vgabios_size + PAGE_SIZE - 1) / PAGE_SIZE; - void * guest_mem = V3_AllocPages(num_pages); - addr_t vgabios_end = VGABIOS_START + (num_pages * PAGE_SIZE); - - PrintDebug("Layout Region %d bytes\n", config_ptr->vgabios_size); - memcpy(V3_VAddr(guest_mem), config_ptr->vgabios, config_ptr->vgabios_size); - - if (v3_add_shadow_mem(info, VGABIOS_START, vgabios_end, (addr_t)guest_mem) == -1) { - PrintError("Could not map VGABIOS\n"); - return -1; - } - - PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", - (void *)VGABIOS_START, - (void *)vgabios_end, - (void *)guest_mem); - - // Fill in the space between the VGABIOS and the ROMBIOS - // We'll just back this to shadow memory for now.... - if (v3_add_shadow_mem(info, vgabios_end, ROMBIOS_START, - (addr_t)V3_AllocPages((ROMBIOS_START - vgabios_end) / PAGE_SIZE)) == -1) { - PrintError("Could not map VGABIOS->ROMBIOS gap\n"); - return -1; - } +static int post_config_guest(struct guest_info * info, struct v3_config * config_ptr) { + + // Configure the memory map for the guest + if (setup_memory_map(info, config_ptr) == -1) { + PrintError("Setting up guest memory map failed...\n"); + return -1; } - /* layout rombios */ - { - uint_t num_pages = (config_ptr->rombios_size + PAGE_SIZE - 1) / PAGE_SIZE; - void * guest_mem = V3_AllocPages(num_pages); - addr_t rombios_end = ROMBIOS_START + (num_pages * PAGE_SIZE); - - PrintDebug("Layout Region %d bytes\n", config_ptr->rombios_size); - memcpy(V3_VAddr(guest_mem), config_ptr->rombios, config_ptr->rombios_size); - - if (v3_add_shadow_mem(info, ROMBIOS_START, rombios_end, (addr_t)guest_mem) == -1) { - PrintError("Could not map ROMBIOS\n"); - return -1; - } - - PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", - (void *)ROMBIOS_START, - (void *)rombios_end, - (void *)guest_mem); - - if (rombios_end != 0x100000) { - PrintError("ROMBIOS must reach the 1MB barrier....\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"); + return -1; } -#ifdef CRAY_XT - { -#define SEASTAR_START 0xffe00000 -#define SEASTAR_END 0xffffffff - - // Fill in generic memory below the seastar - addr_t top_of_mem = (SEASTAR_START < info->mem_size) ? SEASTAR_START : info->mem_size; - int num_low_pages = (top_of_mem - 0x100000) / PAGE_SIZE; - - if (v3_add_shadow_mem(info, 0x100000, top_of_mem, (addr_t)V3_AllocPages(num_low_pages)) == -1) { - PrintError("Could not extended memory below 4G\n"); - return -1; - } - - // 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"); + // v3_print_io_map(info); + v3_print_msr_map(info); + + info->run_state = VM_STOPPED; + + if (info->vm_class == V3_PC_VM) { + if (post_config_pc(info, config_ptr) == -1) { + PrintError("PC Post configuration failure\n"); return -1; } - - - // Add memory above the seastar - if (info->mem_size > SEASTAR_END) { - int num_high_pages = mem_pages - (SEASTAR_END / PAGE_SIZE); - - if (v3_add_shadow_mem(info, SEASTAR_END, info->mem_size, (addr_t)V3_AllocPages(num_high_pages)) == -1) { - PrintError("Could not map extended memory above 4G\n"); - return -1; - } - } - } -#else - // Fill in the extended memory map.... - { - int num_ext_pages = mem_pages - (0x100000 / PAGE_SIZE); - - if (num_ext_pages > 0) { - if (v3_add_shadow_mem(info, 0x100000, info->mem_size, (addr_t)V3_AllocPages(num_ext_pages)) == -1) { - PrintError("Could not allocate extended shadow memory\n"); - return -1; - } - } + } else { + PrintError("Invalid VM Class\n"); + return -1; } -#endif - print_shadow_map(info); return 0; } -static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) { - struct vm_device * ide = NULL; - // struct vm_device * ram_cd = NULL; - struct vm_device * ram_hd = NULL; - struct vm_device * pci = v3_create_pci(); - 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(); - struct vm_device * os_debug = v3_create_os_debug(); - struct vm_device * apic = v3_create_apic(); - struct vm_device * ioapic = v3_create_io_apic(apic); - struct vm_device * para_net = v3_create_para_net(); - - //struct vm_device * serial = v3_create_serial(); - struct vm_device * generic = NULL; - - int use_ramdisk = config_ptr->use_ramdisk; - int use_generic = USE_GENERIC; - - ide = v3_create_ide(pci); - - if (use_ramdisk) { - PrintDebug("Creating Ramdisk\n"); - // ram_cd = v3_create_ram_cd(ide, 0, 0, - // (addr_t)(config_ptr->ramdisk), - // config_ptr->ramdisk_size); - ram_hd = v3_create_ram_hd(ide, 0, 0, - (addr_t)(config_ptr->ramdisk), - config_ptr->ramdisk_size); - } - - - if (use_generic) { - generic = configure_generic(info, config_ptr); - } +int v3_config_guest(struct guest_info * info, void * cfg_blob) { + v3_cpu_arch_t cpu_type = v3_get_cpu_type(v3_get_cpu_id()); + if (cpu_type == V3_INVALID_CPU) { + PrintError("Configuring guest on invalid CPU\n"); + return -1; + } - v3_attach_device(info, pci); + info->cfg_data = parse_config(cfg_blob); - 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); - v3_attach_device(info, os_debug); + if (!info->cfg_data) { + PrintError("Could not parse configuration\n"); + return -1; + } - v3_attach_device(info, apic); - v3_attach_device(info, ioapic); + V3_Print("Preconfiguration\n"); - v3_attach_device(info, para_net); + if (pre_config_guest(info, info->cfg_data) == -1) { + PrintError("Error in preconfiguration\n"); + return -1; + } - v3_attach_device(info, ide); + V3_Print("Arch dependent configuration\n"); - if (use_ramdisk) { - // v3_attach_device(info, ram_cd); - v3_attach_device(info, ram_hd); + // init SVM/VMX +#ifdef CONFIG_SVM + if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) { + if (v3_init_svm_vmcb(info, info->vm_class) == -1) { + PrintError("Error in SVM initialization\n"); + return -1; + } + } +#endif +#ifdef CONFIG_VMX + else if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) { + if (v3_init_vmx_vmcs(info, info->vm_class) == -1) { + PrintError("Error in VMX initialization\n"); + return -1; + } } - - if (use_generic) { - // Important that this be attached last! - v3_attach_device(info, generic); +#endif + else { + PrintError("Invalid CPU Type\n"); + return -1; } - - PrintDebugDevMgr(info); + V3_Print("Post Configuration\n"); - // give keyboard interrupts to vm - // no longer needed since we have a keyboard device - //hook_irq(&vm_info, 1); - -#if 0 - // give floppy controller to vm - v3_hook_passthrough_irq(info, 6); -#endif - - - if (!use_ramdisk) { - PrintDebug("Hooking IDE IRQs\n"); - - //primary ide - v3_hook_passthrough_irq(info, 14); - - // secondary ide - v3_hook_passthrough_irq(info, 15); - } - + if (post_config_guest(info, info->cfg_data) == -1) { + PrintError("Error in postconfiguration\n"); + return -1; + } + + V3_Print("Configuration successfull\n"); 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 +static int setup_memory_map(struct guest_info * info, struct v3_config * config_ptr) { + v3_cfg_tree_t * mem_region = v3_cfg_subtree(v3_cfg_subtree(config_ptr->cfg, "memmap"), "region"); - - + while (mem_region) { + addr_t start_addr = atox(v3_cfg_val(mem_region, "start")); + addr_t end_addr = atox(v3_cfg_val(mem_region, "end")); + addr_t host_addr = atox(v3_cfg_val(mem_region, "host_addr")); - // 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 + if (v3_add_shadow_mem(info, start_addr, end_addr, host_addr) == -1) { + PrintError("Could not map memory region: %p-%p => %p\n", + (void *)start_addr, (void *)end_addr, (void *)host_addr); + return -1; + } + + mem_region = v3_cfg_next_branch(mem_region); } - - 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 + return 0; +} + + -#if 1 - // Make the parallel port invisible - - v3_generic_add_port_range(generic, 0x378, 0x37f, GENERIC_PRINT_AND_IGNORE); -#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 -#if 1 - // Make the ISA PNP features invisible +static int setup_devices(struct guest_info * info, struct v3_config * config_ptr) { + v3_cfg_tree_t * device = v3_cfg_subtree(v3_cfg_subtree(config_ptr->cfg, "devices"), "device"); + - 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(info, id, device) == -1) { + PrintError("Error creating device %s\n", id); + return -1; + } + + device = v3_cfg_next_branch(device); + } -#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); - + v3_print_dev_mgr(info); - return generic; + return 0; } + +