X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=921633f75f652789c5f27833f5170d64d10fd2d0;hb=46b8faf02be8ec628db5683bc6fdb55e72344c18;hp=f226ea58e6285b9d8e6668bd022960a182e15bbe;hpb=37c18b2c2335a41c68c2f0b779fd2b7d51ab216d;p=palacios.git diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index f226ea5..921633f 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -25,7 +25,7 @@ #include #include #include - +#include #include @@ -35,6 +35,8 @@ #include #include +#include + #include @@ -50,7 +52,7 @@ static int configure_generic(struct guest_info * info, struct v3_vm_config * con - +#ifndef VIDEO static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) { return length; @@ -60,7 +62,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; @@ -97,13 +99,23 @@ 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; } +#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; @@ -151,6 +163,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 VIDEO PrintDebug("Setting up memory map (memory size=%dMB)\n", (uint_t)(info->mem_size / (1024 * 1024))); // VGA frame buffer @@ -161,24 +175,31 @@ 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 @@ -188,7 +209,7 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf return -1; } } -#endif +#endif print_shadow_map(info); @@ -199,7 +220,6 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) { - v3_create_device(info, "8259A", NULL); v3_create_device(info, "KEYBOARD", NULL); v3_create_device(info, "8254_PIT", NULL); @@ -207,28 +227,31 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ v3_create_device(info, "OS_DEBUG", NULL); v3_create_device(info, "LAPIC", NULL); v3_create_device(info, "IOAPIC", "LAPIC"); - v3_create_device(info, "PARANET", NULL); + v3_create_device(info, "VMNET", NULL); int use_generic = USE_GENERIC; - if (config_ptr->enable_pci == 1) { - struct ide_cfg ide_config = {"PCI", "PIIX3"}; + struct ide_cfg ide_config = {"PCI", "PIIX3"}; 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, "VIDEO", "PCI"); + v3_create_device(info, "IDE", &ide_config); } else { v3_create_device(info, "IDE", NULL); - } - - - if (config_ptr->pri_disk_type != NONE) { if (config_ptr->pri_disk_type == CDROM) { if (config_ptr->pri_disk_con == RAM) { @@ -246,7 +269,7 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ config_ptr->pri_disk_info.net.disk_name}; PrintDebug("Creating NET CD\n"); - v3_create_device(info, "NET-CD", &cfg); + v3_create_device(info, "NET-CD", &cfg); } } else if (config_ptr->pri_disk_type == HARDDRIVE) { if (config_ptr->pri_disk_con == RAM) { @@ -410,7 +433,7 @@ static int configure_generic(struct guest_info * info, struct v3_vm_config * con #endif -#if 1 +#ifndef VIDEO // Monitor graphics card operations @@ -434,10 +457,7 @@ static int configure_generic(struct guest_info * info, struct v3_vm_config * con v3_generic_add_port_range(generic, 0xc100, 0xc1ff, GENERIC_PRINT_AND_PASSTHROUGH); #endif - - // v3_generic_add_port_range(generic, 0x378, 0x400, GENERIC_PRINT_AND_IGNORE); - return 0; }