X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=a716c5ce6bb89c4942304304e61b3445ba5a180c;hb=55ced750335769366957df3c0cc3fbc8b82a3ea9;hp=8531d58f6b13cfe6c8510c817c5573cf24a26ab2;hpb=058a3adde5893927ae056a1d8fbccd5191d2446f;p=palacios.git diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index 8531d58..a716c5c 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. @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -51,7 +52,7 @@ #define USE_GENERIC 1 - +#include static int setup_memory_map(struct guest_info * info, struct v3_vm_config * config_ptr); @@ -72,30 +73,31 @@ static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, v } - -int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) { - extern v3_cpu_arch_t v3_cpu_type; +int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) { + extern v3_cpu_arch_t v3_cpu_type; // Amount of ram the Guest will have, rounded to a 4K page boundary info->mem_size = config_ptr->mem_size & ~(addr_t)0xfff; + // 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); - + + v3_init_decoder(info); v3_init_hypercall_map(info); - + // Initialize the memory map v3_init_shadow_map(info); - if ((v3_cpu_type == V3_SVM_REV3_CPU) && (config_ptr->enable_nested_paging == 1)) { PrintDebug("Guest Page Mode: NESTED_PAGING\n"); @@ -105,38 +107,56 @@ 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; } + + if (config_ptr->enable_profiling) { + info->enable_profiler = 1; + v3_init_profiler(info); + } else { + info->enable_profiler = 0; + } + // Initial CPU operating mode info->cpu_mode = REAL; info->mem_mode = PHYSICAL_MEM; - + + return 0; +} + + +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"); 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; - } - //v3_hook_io_port(info, 1234, &IO_Read, NULL, info); - - // Setup initial cpu register state - info->rip = 0xfff0; - info->vm_regs.rsp = 0x0; - + if (setup_devices(info, config_ptr) == -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; + return 0; } + + + /* TODO: * The amount of guest memory is stored in info->mem_size * We need to make sure the memory map extends to cover it @@ -223,12 +243,10 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ ide = v3_create_ide(NULL, NULL); } - - nvram = v3_create_nvram(ide); if (config_ptr->use_ram_cd == 1) { - PrintDebug("Creating Ram CD\n"); + PrintDebug("Creating RAM CD\n"); ramdisk = v3_create_ram_cd(ide, 0, 0, (addr_t)(config_ptr->ramdisk), config_ptr->ramdisk_size); @@ -237,17 +255,19 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ ramdisk = v3_create_ram_hd(ide, 0, 0, (addr_t)(config_ptr->ramdisk), config_ptr->ramdisk_size); + } else if (config_ptr->use_net_cd == 1) { + PrintDebug("Creating NET CD\n"); + ramdisk = v3_create_net_cd(ide, 0, 0, + "172.22.0.1", 9502, + "puppy-iso"); } - - + + if (use_generic) { generic = configure_generic(info, config_ptr); } - - - v3_attach_device(info, pic); v3_attach_device(info, pit); v3_attach_device(info, keyboard); @@ -291,10 +311,16 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ + + 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(); + + // 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) @@ -392,11 +418,7 @@ static struct vm_device * configure_generic(struct guest_info * info, struct v3 #endif -#if 1 - // Make any Bus master ide controller invisible - - v3_generic_add_port_range(generic, 0xc000, 0xc00f, GENERIC_PRINT_AND_IGNORE); -#endif + // v3_generic_add_port_range(generic, 0x378, 0x400, GENERIC_PRINT_AND_IGNORE);