X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=b80c0eb797c12784a930e0abffd4f8e171679af3;hb=7cdedeb7a01b51c5242cce94924f2ea246008e7d;hp=17ca9e4f13c4046539d2048b41f6b1d52fb4ef60;hpb=a1a2be8eb002e13b1eb6ccaca40e4396f8816402;p=palacios.git diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index 17ca9e4..b80c0eb 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -1,6 +1,21 @@ -/* (c) 2008, Jack Lange */ -/* (c) 2008, The V3VEE Project */ - +/* + * 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. + * + * The V3VEE Project is a joint project between Northwestern University + * and the University of New Mexico. You can find out more at + * http://www.v3vee.org + * + * Copyright (c) 2008, Jack Lange + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Jack Lange + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ #include #include @@ -14,10 +29,29 @@ #include #include #include +#include +#include + +#include #define USE_GENERIC 1 -#define USE_RAMDISK 0 + +#define MAGIC_CODE 0xf1e2d3c4 + + + +struct layout_region { + ulong_t length; + ulong_t final_addr; +}; + +struct guest_mem_layout { + ulong_t magic; + ulong_t num_regions; + struct layout_region regions[0]; +}; + @@ -42,33 +76,15 @@ static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, v } -/*static int IO_Read(ushort_t port, void * dst, uint_t length, void * priv_data) { - - struct guest_info * info = priv_data; - ulong_t tsc_spread = 0; - ullong_t exit_tsc = 0; - - *(ulong_t *)(&exit_tsc) = info->vm_regs.rbx; - *(ulong_t *)((&exit_tsc) + 4) = info->vm_regs.rcx; - tsc_spread = info->exit_tsc - exit_tsc; - - PrintError("IOREAD tsc diff = %lu\n",tsc_spread); - info->rip += 3; - - - return 1; -} -*/ +int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) { -int config_guest(struct guest_info * info, void * config_ptr) { - - struct guest_mem_layout * layout = (struct guest_mem_layout *)config_ptr; + struct guest_mem_layout * layout = (struct guest_mem_layout *)config_ptr->vm_kernel; extern v3_cpu_arch_t v3_cpu_type; void * region_start; - int i; + uint_t i; - int use_ramdisk = USE_RAMDISK; + int use_ramdisk = config_ptr->use_ramdisk; int use_generic = USE_GENERIC; @@ -78,7 +94,7 @@ int config_guest(struct guest_info * info, void * config_ptr) { if (v3_cpu_type == V3_SVM_REV3_CPU) { info->shdw_pg_mode = NESTED_PAGING; } else { - init_shadow_page_state(info); + v3_init_shadow_page_state(info); info->shdw_pg_mode = SHADOW_PAGING; } @@ -86,13 +102,15 @@ int config_guest(struct guest_info * info, void * config_ptr) { info->mem_mode = PHYSICAL_MEM; - init_vmm_io_map(info); - init_interrupt_state(info); + v3_init_vmm_io_map(info); + v3_init_interrupt_state(info); - dev_mgr_init(info); + v3_init_dev_mgr(info); - init_emulator(info); + v3_init_emulator(info); + v3_init_host_events(info); + // SerialPrint("Guest Mem Dump at 0x%x\n", 0x100000); //PrintDebugMemDump((unsigned char *)(0x100000), 261 * 1024); @@ -164,29 +182,33 @@ int config_guest(struct guest_info * info, void * config_ptr) { print_shadow_map(&(info->mem_map)); - { struct vm_device * ramdisk = NULL; - struct vm_device * nvram = create_nvram(); - //struct vm_device * timer = create_timer(); - struct vm_device * pic = create_pic(); - struct vm_device * keyboard = create_keyboard(); - struct vm_device * pit = create_pit(); - //struct vm_device * serial = create_serial(); + struct vm_device * cdrom = 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(); + struct vm_device * bochs_debug = v3_create_bochs_debug(); + + //struct vm_device * serial = v3_create_serial(); struct vm_device * generic = NULL; - //Zheng 09/29/2008 + + if (use_ramdisk) { PrintDebug("Creating Ramdisk\n"); - ramdisk = create_ramdisk(); + ramdisk = v3_create_ramdisk(); + cdrom = v3_create_cdrom(ramdisk, config_ptr->ramdisk, config_ptr->ramdisk_size); } if (use_generic) { PrintDebug("Creating Generic Device\n"); - generic = create_generic(); + generic = v3_create_generic(); // Make the DMA controller invisible v3_generic_add_port_range(generic, 0x00, 0x07, GENERIC_PRINT_AND_IGNORE); // DMA 1 channels 0,1,2,3 (address, counter) @@ -212,11 +234,10 @@ int config_guest(struct guest_info * info, void * config_ptr) { -#ifndef DEBUG_RAMDISK - + v3_generic_add_port_range(generic, 0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE); // COM 3 v3_generic_add_port_range(generic, 0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE); // COM 4 -#endif + @@ -227,13 +248,14 @@ int config_guest(struct guest_info * info, void * config_ptr) { +#if 0 if (!use_ramdisk) { // Monitor the IDE controllers (very slow) v3_generic_add_port_range(generic, 0x170, 0x178, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 1 v3_generic_add_port_range(generic, 0x376, 0x377, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 1 } -#if 1 + v3_generic_add_port_range(generic, 0x1f0, 0x1f8, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 0 v3_generic_add_port_range(generic, 0x3f6, 0x3f7, GENERIC_PRINT_AND_PASSTHROUGH); // IDE 0 #endif @@ -304,9 +326,11 @@ int config_guest(struct guest_info * info, void * config_ptr) { v3_attach_device(info, pit); v3_attach_device(info, keyboard); // v3_attach_device(info, serial); + v3_attach_device(info, bochs_debug); if (use_ramdisk) { v3_attach_device(info, ramdisk); + v3_attach_device(info, cdrom); } if (use_generic) { @@ -323,16 +347,18 @@ int config_guest(struct guest_info * info, void * config_ptr) { #if 0 // give floppy controller to vm - v3_hook_irq_for_guest_injection(info, 6); + v3_hook_passthrough_irq(info, 6); #endif if (!use_ramdisk) { + PrintDebug("Hooking IDE IRQs\n"); + //primary ide - v3_hook_irq_for_guest_injection(info, 14); + v3_hook_passthrough_irq(info, 14); // secondary ide - v3_hook_irq_for_guest_injection(info, 15); + v3_hook_passthrough_irq(info, 15); } //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);