X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=886aee7f2db3b256f113fe0957fad6695da01a43;hp=397b22850276decc03c0bd9473e58eb0fe45fc96;hb=0e097100a26bc43eb8964734fa43130fc4c71429;hpb=217e4d9dbb18e7c8dfd26f9fd74770614dd2024c diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index 397b228..886aee7 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -22,11 +22,21 @@ #include #include #include -#include +#include #include #include #include +#include +#include +#ifdef CONFIG_SYMBIOTIC +#include + +#ifdef CONFIG_SYMBIOTIC_SWAP +#include +#endif + +#endif #include #include @@ -35,10 +45,25 @@ #include #include +#include +#include + + +/* +static const char * test_cfg_xml = \ +"\n \ +2048\n\ +\n\ +\n\ +\n\ +\n\ +"; +*/ + + #include -#define USE_GENERIC 1 #include @@ -50,7 +75,7 @@ static int configure_generic(struct guest_info * info, struct v3_vm_config * con - +#ifdef CONFIG_PASSTHROUGH_VIDEO static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) { return length; @@ -60,34 +85,65 @@ static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, v return length; } - +#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[]; + + + /* + { + struct v3_xml * cfg = v3_xml_parse((char *)test_cfg_xml); + struct v3_xml * devs = NULL; + struct v3_xml * tmp = NULL; + PrintError("Parsed XML COnfig %s\n", v3_xml_name(cfg)); + + PrintError("memory=%s\n", v3_xml_txt(v3_xml_child(cfg, "memory"))); + + devs = v3_xml_child(cfg, "devices"); + + for (tmp = v3_xml_child(devs, "device"); tmp; tmp = v3_xml_next(tmp)) { + PrintError("Device: %s, id=%s\n", + v3_xml_name(tmp), + v3_xml_attr(tmp, "id")); + } + v3_xml_free(cfg); + + return -1; + } + */ // 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_init_shadow_map(info) == -1) { + PrintError("Could not initialize shadow map\n"); + return -1; + } - 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; @@ -97,13 +153,30 @@ int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_p info->shdw_pg_mode = SHADOW_PAGING; } - 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_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; } + PrintDebug("CPU_KHZ = %d, schedule_freq=%p\n", V3_CPU_KHZ(), (void *)config_ptr->schedule_freq); + + info->yield_cycle_period = (V3_CPU_KHZ() * 1000) / config_ptr->schedule_freq; // Initial CPU operating mode info->cpu_mode = REAL; @@ -128,6 +201,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; @@ -151,6 +227,8 @@ int v3_post_config_guest(struct guest_info * info, struct v3_vm_config * config_ * 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) { + +#ifdef CONFIG_PASSTHROUGH_VIDEO PrintDebug("Setting up memory map (memory size=%dMB)\n", (uint_t)(info->mem_size / (1024 * 1024))); // VGA frame buffer @@ -162,23 +240,30 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf } else { v3_hook_write_mem(info, 0xa0000, 0xc0000, 0xa0000, passthrough_mem_write, NULL); } +#endif #define VGABIOS_START 0x000c0000 #define ROMBIOS_START 0x000f0000 /* layout vgabios */ { + extern uint8_t v3_vgabios_start[]; + extern uint8_t v3_vgabios_end[]; + 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); + memcpy(V3_VAddr((void *)vgabios_dst), v3_vgabios_start, v3_vgabios_end - v3_vgabios_start); } /* layout rombios */ { + extern uint8_t v3_rombios_start[]; + extern uint8_t v3_rombios_end[]; + 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); + memcpy(V3_VAddr((void *)rombios_dst), v3_rombios_start, v3_rombios_end - v3_rombios_start); } -#ifdef CRAY_XT +#ifdef CONFIG_CRAY_XT { #define SEASTAR_START 0xffe00000 #define SEASTAR_END 0xffffffff @@ -190,7 +275,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; } @@ -208,21 +293,35 @@ 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_qemu_pt_cfg = {"PCI", "E1000", 0x8086, 0x100e}; + struct pci_passthrough_cfg pci_hw_pt_cfg = {"PCI", "E1000", 0x8086, 0x107c}; v3_create_device(info, "PCI", NULL); v3_create_device(info, "i440FX", "PCI"); v3_create_device(info, "PIIX3", "PCI"); + v3_create_device(info, "LNX_VIRTIO_SYM", "PCI"); 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"); + // v3_create_device(info, "TMP_BLK", "LNX_VIRTIO_BLK"); v3_create_device(info, "IDE", &ide_config); + + v3_create_device(info, "PCI_PASSTHROUGH", &pci_qemu_pt_cfg); + v3_create_device(info, "PCI_PASSTHROUGH", &pci_hw_pt_cfg); + + } else { v3_create_device(info, "IDE", NULL); } @@ -264,6 +363,18 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ PrintDebug("Creating NET HD\n"); v3_create_device(info, "NET-HD", &cfg); } + + } else if (config_ptr->pri_disk_type == VIRTIO) { + if (config_ptr->pri_disk_con == RAM) { + struct ram_hd_cfg cfg = {"LNX_VIRTIO_BLK", 0, 0, + (addr_t)(config_ptr->pri_disk_info.ram.data_ptr), + config_ptr->pri_disk_info.ram.size}; + + PrintDebug("Creating Virtio RAM HD\n"); + + v3_create_device(info, "RAM-HD", &cfg); + } + } } @@ -307,9 +418,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"); @@ -321,7 +432,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); @@ -409,7 +520,7 @@ static int configure_generic(struct guest_info * info, struct v3_vm_config * con #endif -#if 1 +#ifdef CONFIG_PASTHROUGH_VIDEO // Monitor graphics card operations @@ -437,3 +548,4 @@ static int configure_generic(struct guest_info * info, struct v3_vm_config * con return 0; } +#endif