X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=72887c657819bef71e33bddf3d6123da3012d987;hp=921633f75f652789c5f27833f5170d64d10fd2d0;hb=c06413341bf1dca02f22c0502fa5c2d1c2c11eab;hpb=46b8faf02be8ec628db5683bc6fdb55e72344c18 diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index 921633f..72887c6 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -22,11 +22,16 @@ #include #include #include -#include +#include #include #include #include +#include +#include +#ifdef CONFIG_SYMBIOTIC_SWAP +#include +#endif #include #include @@ -35,12 +40,14 @@ #include #include -#include +#include +#include + + #include -#define USE_GENERIC 1 #include @@ -52,7 +59,7 @@ static int configure_generic(struct guest_info * info, struct v3_vm_config * con -#ifndef VIDEO +#ifdef CONFIG_PASSTHROUGH_VIDEO static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) { return length; @@ -65,31 +72,36 @@ static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, v #endif int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) { - extern v3_cpu_arch_t v3_cpu_type; + extern v3_cpu_arch_t v3_cpu_types[]; // Amount of ram the Guest will have, rounded to a 4K page boundary info->mem_size = config_ptr->mem_size & ~(addr_t)0xfff; + info->cpu_id = config_ptr->guest_cpu; - // Initialize the subsystem data strutures - v3_init_time(info); + /* + * 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); + } else { + info->enable_telemetry = 0; + } +#endif + + v3_init_hypercall_map(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_cpuid_map(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) && + 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; @@ -99,15 +111,20 @@ int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_p info->shdw_pg_mode = SHADOW_PAGING; } -#ifdef CONFIG_PROFILE_VMM - if (config_ptr->enable_profiling) { - info->enable_profiler = 1; - v3_init_profiler(info); - } else { - info->enable_profiler = 0; - } + 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 + if (config_ptr->schedule_freq == 0) { // set the schedule frequency to 100 HZ config_ptr->schedule_freq = 100; @@ -140,6 +157,9 @@ int v3_post_config_guest(struct guest_info * info, struct v3_vm_config * config_ return -1; } + // v3_print_io_map(info); + v3_print_msr_map(info); + info->run_state = VM_STOPPED; info->vm_regs.rdi = 0; @@ -164,7 +184,7 @@ int v3_post_config_guest(struct guest_info * info, struct v3_vm_config * config_ */ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * config_ptr) { -#ifndef VIDEO +#ifdef CONFIG_PASSTHROUGH_VIDEO PrintDebug("Setting up memory map (memory size=%dMB)\n", (uint_t)(info->mem_size / (1024 * 1024))); // VGA frame buffer @@ -211,7 +231,7 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf } #endif - print_shadow_map(info); + v3_print_mem_map(info); return 0; } @@ -229,10 +249,16 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ v3_create_device(info, "IOAPIC", "LAPIC"); v3_create_device(info, "VMNET", NULL); - int use_generic = USE_GENERIC; + + 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 (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"); @@ -244,9 +270,10 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ v3_create_device(info, "LNX_VIRTIO_BALLOON", "PCI"); v3_create_device(info, "SYM_SWAP", "LNX_VIRTIO_BLK"); - v3_create_device(info, "VIDEO", "PCI"); - v3_create_device(info, "IDE", &ide_config); + + v3_create_device(info, "PCI_PASSTHROUGH", &pci_pt_cfg); + } else { v3_create_device(info, "IDE", NULL); } @@ -331,9 +358,9 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ - if (use_generic) { +#ifdef CONFIG_GENERIC configure_generic(info, config_ptr); - } +#endif // This should go last because it requires information about the Harddrives v3_create_device(info, "NVRAM", "IDE"); @@ -345,7 +372,7 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ - +#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); @@ -433,7 +460,7 @@ static int configure_generic(struct guest_info * info, struct v3_vm_config * con #endif -#ifndef VIDEO +#ifdef CONFIG_PASTHROUGH_VIDEO // Monitor graphics card operations @@ -461,3 +488,4 @@ static int configure_generic(struct guest_info * info, struct v3_vm_config * con return 0; } +#endif