X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=af45a0a4be050f1d1f0d0eea83d48df6d96428e4;hb=61597ea2c5ccace036d8a65e429e32b8f8a7ed4a;hp=00123f34671f5ff6a4ad12dd8651e00b14c451eb;hpb=942df9bb1e2570764d24c74f797247536639502e;p=palacios.git diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index 00123f3..af45a0a 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -22,11 +22,15 @@ #include #include #include -#include +#include #include #include #include +#ifdef CONFIG_SYMBIOTIC_SWAP +#include +#endif + #include #include @@ -35,10 +39,13 @@ #include #include +#include + + + #include -#define USE_GENERIC 1 #include @@ -50,7 +57,7 @@ static int configure_generic(struct guest_info * info, struct v3_vm_config * con - +#ifndef CONFIG_VIDEO static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) { return length; @@ -60,7 +67,7 @@ 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; @@ -68,8 +75,19 @@ int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_p // 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 + */ +#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 - // Initialize the subsystem data strutures v3_init_time(info); v3_init_io_map(info); v3_init_msr_map(info); @@ -83,6 +101,11 @@ int v3_pre_config_guest(struct guest_info * info, struct v3_vm_config * config_p v3_init_hypercall_map(info); +#ifdef CONFIG_SYMBIOTIC_SWAP + v3_init_sym_swap(info); +#endif + + // Initialize the memory map v3_init_shadow_map(info); @@ -97,13 +120,16 @@ 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; + + + 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; @@ -151,6 +177,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) { + +#ifndef CONFIG_VIDEO PrintDebug("Setting up memory map (memory size=%dMB)\n", (uint_t)(info->mem_size / (1024 * 1024))); // VGA frame buffer @@ -162,23 +190,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 @@ -208,7 +243,7 @@ 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; + if (config_ptr->enable_pci == 1) { struct ide_cfg ide_config = {"PCI", "PIIX3"}; @@ -218,9 +253,13 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ 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, "VIDEO", "PCI"); + v3_create_device(info, "IDE", &ide_config); } else { v3_create_device(info, "IDE", NULL); @@ -306,9 +345,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"); @@ -320,7 +359,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); @@ -408,7 +447,7 @@ static int configure_generic(struct guest_info * info, struct v3_vm_config * con #endif -#if 1 +#ifndef CONFIG_VIDEO // Monitor graphics card operations @@ -436,3 +475,4 @@ static int configure_generic(struct guest_info * info, struct v3_vm_config * con return 0; } +#endif