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=4387f8b8cb9f9c37340bbba7a4009a55e1565793;hpb=c016bb46bd68474161e275a5ace086c3fb810d9f;p=palacios.git diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index 4387f8b..921633f 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. @@ -25,25 +25,17 @@ #include #include #include +#include -#include -#include -#include -#include -#include #include #include #include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include #include @@ -51,16 +43,16 @@ #define USE_GENERIC 1 - +#include static int setup_memory_map(struct guest_info * info, struct v3_vm_config * config_ptr); static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr); -static struct vm_device * configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr); - +static int configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr); +#ifndef VIDEO static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) { return length; @@ -70,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; @@ -107,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; @@ -161,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 @@ -171,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 @@ -198,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); @@ -209,99 +220,123 @@ 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) { - struct vm_device * ide = NULL; - struct vm_device * ramdisk = NULL; + v3_create_device(info, "8259A", NULL); + v3_create_device(info, "KEYBOARD", NULL); + v3_create_device(info, "8254_PIT", NULL); + v3_create_device(info, "BOCHS_DEBUG", NULL); + v3_create_device(info, "OS_DEBUG", NULL); + v3_create_device(info, "LAPIC", NULL); + v3_create_device(info, "IOAPIC", "LAPIC"); + v3_create_device(info, "VMNET", NULL); - struct vm_device * pci = NULL; - struct vm_device * northbridge = NULL; - struct vm_device * southbridge = NULL; - - struct vm_device * nvram = NULL; - struct vm_device * pic = v3_create_pic(); - struct vm_device * keyboard = v3_create_keyboard(); - struct vm_device * pit = v3_create_pit(); - struct vm_device * bochs_debug = v3_create_bochs_debug(); - struct vm_device * os_debug = v3_create_os_debug(); - struct vm_device * apic = v3_create_apic(); - struct vm_device * ioapic = v3_create_io_apic(apic); - struct vm_device * para_net = v3_create_para_net(); - - - //struct vm_device * serial = v3_create_serial(); - struct vm_device * generic = NULL; - - int use_generic = USE_GENERIC; if (config_ptr->enable_pci == 1) { - pci = v3_create_pci(); - northbridge = v3_create_i440fx(pci); - southbridge = v3_create_piix3(pci); - ide = v3_create_ide(pci, southbridge); - } else { - ide = v3_create_ide(NULL, NULL); - } - + 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"); - nvram = v3_create_nvram(ide); + v3_create_device(info, "VIDEO", "PCI"); - if (config_ptr->use_ram_cd == 1) { - PrintDebug("Creating Ram CD\n"); - ramdisk = v3_create_ram_cd(ide, 0, 0, - (addr_t)(config_ptr->ramdisk), - config_ptr->ramdisk_size); - } else if (config_ptr->use_ram_hd == 1) { - PrintDebug("Creating Ram HD\n"); - ramdisk = v3_create_ram_hd(ide, 0, 0, - (addr_t)(config_ptr->ramdisk), - config_ptr->ramdisk_size); - } - - - if (use_generic) { - generic = configure_generic(info, config_ptr); + 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) { + struct ram_cd_cfg cfg = {"IDE", 0, 0, + (addr_t)(config_ptr->pri_disk_info.ram.data_ptr), + config_ptr->pri_disk_info.ram.size}; + + PrintDebug("Creating RAM CD\n"); + + v3_create_device(info, "RAM-CD", &cfg); + } else if (config_ptr->pri_disk_con == NETWORK) { + struct net_cd_cfg cfg = {"IDE", 0, 0, + config_ptr->pri_disk_info.net.ip_str, + config_ptr->pri_disk_info.net.port, + config_ptr->pri_disk_info.net.disk_name}; + PrintDebug("Creating NET CD\n"); + + v3_create_device(info, "NET-CD", &cfg); + } + } else if (config_ptr->pri_disk_type == HARDDRIVE) { + if (config_ptr->pri_disk_con == RAM) { + struct ram_hd_cfg cfg = {"IDE", 0, 0, + (addr_t)(config_ptr->pri_disk_info.ram.data_ptr), + config_ptr->pri_disk_info.ram.size}; + + PrintDebug("Creating RAM HD\n"); + + v3_create_device(info, "RAM-HD", &cfg); + } else if (config_ptr->pri_disk_con == NETWORK) { + struct net_hd_cfg cfg = {"IDE", 0, 0, + config_ptr->pri_disk_info.net.ip_str, + config_ptr->pri_disk_info.net.port, + config_ptr->pri_disk_info.net.disk_name}; + PrintDebug("Creating NET HD\n"); + v3_create_device(info, "NET-HD", &cfg); + } + } + } - v3_attach_device(info, pic); - v3_attach_device(info, pit); - v3_attach_device(info, keyboard); - // v3_attach_device(info, serial); - v3_attach_device(info, bochs_debug); - v3_attach_device(info, os_debug); - - v3_attach_device(info, apic); - v3_attach_device(info, ioapic); - - v3_attach_device(info, para_net); - - if (config_ptr->enable_pci == 1) { - PrintDebug("Attaching PCI\n"); - v3_attach_device(info, pci); - PrintDebug("Attaching Northbridge\n"); - v3_attach_device(info, northbridge); - PrintDebug("Attaching Southbridge\n"); - v3_attach_device(info, southbridge); + if (config_ptr->sec_disk_type != NONE) { + if (config_ptr->sec_disk_type == CDROM) { + if (config_ptr->sec_disk_con == RAM) { + struct ram_cd_cfg cfg = {"IDE", 0, 1, + (addr_t)(config_ptr->sec_disk_info.ram.data_ptr), + config_ptr->sec_disk_info.ram.size}; + + PrintDebug("Creating RAM CD\n"); + v3_create_device(info, "RAM-CD", &cfg); + } else if (config_ptr->sec_disk_con == NETWORK) { + struct net_cd_cfg cfg = {"IDE", 0, 1, + config_ptr->sec_disk_info.net.ip_str, + config_ptr->sec_disk_info.net.port, + config_ptr->sec_disk_info.net.disk_name}; + + PrintDebug("Creating NET CD\n"); + v3_create_device(info, "NET-CD", &cfg); + } + } else if (config_ptr->sec_disk_type == HARDDRIVE) { + if (config_ptr->sec_disk_con == RAM) { + struct ram_hd_cfg cfg = {"IDE", 0, 1, + (addr_t)(config_ptr->sec_disk_info.ram.data_ptr), + config_ptr->sec_disk_info.ram.size}; + PrintDebug("Creating RAM HD\n"); + v3_create_device(info, "RAM-HD", &cfg); + } else if (config_ptr->sec_disk_con == NETWORK) { + struct net_hd_cfg cfg = {"IDE", 0, 1, + config_ptr->sec_disk_info.net.ip_str, + config_ptr->sec_disk_info.net.port, + config_ptr->sec_disk_info.net.disk_name}; + PrintDebug("Creating NET HD\n"); + v3_create_device(info, "NET-HD", &cfg); + } + } } - PrintDebug("Attaching IDE\n"); - v3_attach_device(info, ide); - if (ramdisk != NULL) { - v3_attach_device(info, ramdisk); - } if (use_generic) { - // Important that this be attached last! - v3_attach_device(info, generic); + configure_generic(info, config_ptr); } - // This should go last because it contains the hardware state - v3_attach_device(info, nvram); + // This should go last because it requires information about the Harddrives + v3_create_device(info, "NVRAM", "IDE"); PrintDebugDevMgr(info); @@ -311,12 +346,18 @@ 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) { +static int configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr) { PrintDebug("Creating Generic Device\n"); - struct vm_device * generic = v3_create_generic(); + v3_create_device(info, "GENERIC", NULL); + struct vm_device * generic = v3_find_dev(info, "GENERIC"); + + if (!generic) { + PrintError("Could not find generic device\n"); + return -1; + } + // port 0x92: A20 enable/disable (bit 2) (This causes an MMU flush) @@ -392,7 +433,7 @@ static struct vm_device * configure_generic(struct guest_info * info, struct v3 #endif -#if 1 +#ifndef VIDEO // Monitor graphics card operations @@ -416,10 +457,7 @@ static struct vm_device * configure_generic(struct guest_info * info, struct v3 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 generic; + return 0; }