X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=ff6dce49eb73ed095347420c0e9cc0b65a03d86a;hb=a7dc3322984b3c76fe990de506418e180ec1b0de;hp=f5ca6635d9a07a64113b436c801279c9c9a115cd;hpb=266af4b5b19da7bee8e7445288c7c1cb3ee194c7;p=palacios.git diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index f5ca663..ff6dce4 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -33,13 +33,17 @@ #include #include #include -#include -#include +#include +#include +#include #include #include #include #include - +#include +#include +#include +#include #include @@ -86,10 +90,12 @@ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) v3_init_hypercall_map(info); - - if (v3_cpu_type == V3_SVM_REV3_CPU) { + if ((v3_cpu_type == V3_SVM_REV3_CPU) && + (config_ptr->enable_nested_paging == 1)) { + PrintDebug("Guest Page Mode: NESTED_PAGING\n"); info->shdw_pg_mode = NESTED_PAGING; } else { + PrintDebug("Guest Page Mode: SHADOW_PAGING\n"); v3_init_shadow_page_state(info); info->shdw_pg_mode = SHADOW_PAGING; } @@ -222,8 +228,38 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf } } +#ifdef CRAY_XT + { +#define SEASTAR_START 0xffe00000 +#define SEASTAR_END 0xffffffff + + // Fill in generic memory below the seastar + addr_t top_of_mem = (SEASTAR_START < info->mem_size) ? SEASTAR_START : info->mem_size; + int num_low_pages = (top_of_mem - 0x100000) / PAGE_SIZE; + + if (v3_add_shadow_mem(info, 0x100000, top_of_mem, (addr_t)V3_AllocPages(num_low_pages)) == -1) { + PrintError("Could not extended memory below 4G\n"); + return -1; + } + + // Map the Seastar straight through + if (v3_add_shadow_mem(info, SEASTAR_START, SEASTAR_END, SEASTAR_START) == -1) { + PrintError("Could not map through the seastar\n"); + return -1; + } + + + // Add memory above the seastar + if (info->mem_size > SEASTAR_END) { + int num_high_pages = mem_pages - (SEASTAR_END / PAGE_SIZE); - + if (v3_add_shadow_mem(info, SEASTAR_END, info->mem_size, (addr_t)V3_AllocPages(num_high_pages)) == -1) { + PrintError("Could not map extended memory above 4G\n"); + return -1; + } + } + } +#else // Fill in the extended memory map.... { int num_ext_pages = mem_pages - (0x100000 / PAGE_SIZE); @@ -235,7 +271,8 @@ static int setup_memory_map(struct guest_info * info, struct v3_vm_config * conf } } } - +#endif + print_shadow_map(info); return 0; @@ -244,10 +281,15 @@ 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; - struct vm_device * cdrom = NULL; + + struct vm_device * pci = NULL; + struct vm_device * northbridge = NULL; + struct vm_device * southbridge = NULL; + struct vm_device * nvram = v3_create_nvram(); - //struct vm_device * timer = v3_create_timer(); struct vm_device * pic = v3_create_pic(); struct vm_device * keyboard = v3_create_keyboard(); struct vm_device * pit = v3_create_pit(); @@ -255,18 +297,35 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ 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_ramdisk = config_ptr->use_ramdisk; + 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); + } + - if (use_ramdisk) { - PrintDebug("Creating Ramdisk\n"); - ramdisk = v3_create_ramdisk(); - cdrom = v3_create_cdrom(ramdisk, config_ptr->ramdisk, config_ptr->ramdisk_size); + 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); } @@ -275,8 +334,9 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ } + + v3_attach_device(info, nvram); - //v3_attach_device(info, timer); v3_attach_device(info, pic); v3_attach_device(info, pit); v3_attach_device(info, keyboard); @@ -287,9 +347,19 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ v3_attach_device(info, apic); v3_attach_device(info, ioapic); - if (use_ramdisk) { + v3_attach_device(info, para_net); + + if (config_ptr->enable_pci == 1) { + v3_attach_device(info, pci); + v3_attach_device(info, northbridge); + v3_attach_device(info, southbridge); + } + + v3_attach_device(info, ide); + + + if (ramdisk != NULL) { v3_attach_device(info, ramdisk); - v3_attach_device(info, cdrom); } if (use_generic) { @@ -299,28 +369,6 @@ static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ PrintDebugDevMgr(info); - - // give keyboard interrupts to vm - // no longer needed since we have a keyboard device - //hook_irq(&vm_info, 1); - -#if 0 - // give floppy controller to vm - v3_hook_passthrough_irq(info, 6); -#endif - - - if (!use_ramdisk) { - PrintDebug("Hooking IDE IRQs\n"); - - //primary ide - v3_hook_passthrough_irq(info, 14); - - // secondary ide - v3_hook_passthrough_irq(info, 15); - } - - return 0; } @@ -363,8 +411,8 @@ static struct vm_device * configure_generic(struct guest_info * info, struct v3 // Make the PCI bus invisible (at least it's configuration) - v3_generic_add_port_range(generic, 0xcf8, 0xcf8, GENERIC_PRINT_AND_IGNORE); // PCI Config Address - v3_generic_add_port_range(generic, 0xcfc, 0xcfc, GENERIC_PRINT_AND_IGNORE); // PCI Config Data + //v3_generic_add_port_range(generic, 0xcf8, 0xcf8, GENERIC_PRINT_AND_IGNORE); // PCI Config Address + //v3_generic_add_port_range(generic, 0xcfc, 0xcfc, GENERIC_PRINT_AND_IGNORE); // PCI Config Data