X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=3a4cbaf5176d2dcd0d88590b45128d9bfa1755e0;hb=a46778669bb94bcf6b0a05646123ff748cfe86be;hp=ec8891ffba690bd5c508bd48f61bc461c22f32a5;hpb=4381d301f8bdb373db95231264bd5d0e34b04ec8;p=palacios.git diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index ec8891f..3a4cbaf 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 @@ -13,11 +28,30 @@ #include #include #include - -//Zheng 09/29/2008 -#ifdef RAMDISK_BOOT #include -#endif +#include + + +#include + +#define USE_GENERIC 1 + +#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]; +}; + + static int mem_test_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) { @@ -60,14 +94,20 @@ static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, v } */ -int config_guest(struct guest_info * info, void * config_ptr) { - struct guest_mem_layout * layout = (struct guest_mem_layout *)config_ptr; + + +int config_guest(struct guest_info * info, struct v3_vm_config * 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; - + int use_ramdisk = config_ptr->use_ramdisk; + int use_generic = USE_GENERIC; + + v3_init_time(info); init_shadow_map(info); @@ -89,6 +129,8 @@ int config_guest(struct guest_info * info, void * config_ptr) { init_emulator(info); + v3_init_host_events(info); + // SerialPrint("Guest Mem Dump at 0x%x\n", 0x100000); //PrintDebugMemDump((unsigned char *)(0x100000), 261 * 1024); @@ -160,93 +202,94 @@ int config_guest(struct guest_info * info, void * config_ptr) { print_shadow_map(&(info->mem_map)); - { - + struct vm_device * ramdisk = NULL; + struct vm_device * cdrom = 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(); - - //Zheng 09/29/2008 + struct vm_device * generic = NULL; -#ifdef RAMDISK_BOOT - struct vm_device * ramdisk = create_ramdisk(); -#endif + + + + if (use_ramdisk) { + PrintDebug("Creating Ramdisk\n"); + ramdisk = create_ramdisk(); + cdrom = v3_create_cdrom(ramdisk, config_ptr->ramdisk, config_ptr->ramdisk_size); + } -#define GENERIC 1 -#if GENERIC - generic_port_range_type range[] = { -#if 1 + if (use_generic) { + PrintDebug("Creating Generic Device\n"); + generic = create_generic(); + // Make the DMA controller invisible - - {0x00, 0x07, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channels 0,1,2,3 (address, counter) - {0xc0, 0xc7, GENERIC_PRINT_AND_IGNORE}, // DMA 2 channels 4,5,6,7 (address, counter) - {0x87, 0x87, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channel 0 page register - {0x83, 0x83, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channel 1 page register - {0x81, 0x81, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channel 2 page register - {0x82, 0x82, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channel 3 page register - {0x8f, 0x8f, GENERIC_PRINT_AND_IGNORE}, // DMA 2 channel 4 page register - {0x8b, 0x8b, GENERIC_PRINT_AND_IGNORE}, // DMA 2 channel 5 page register - {0x89, 0x89, GENERIC_PRINT_AND_IGNORE}, // DMA 2 channel 6 page register - {0x8a, 0x8a, GENERIC_PRINT_AND_IGNORE}, // DMA 2 channel 7 page register - {0x08, 0x0f, GENERIC_PRINT_AND_IGNORE}, // DMA 1 misc registers (csr, req, smask,mode,clearff,reset,enable,mmask) - {0xd0, 0xde, GENERIC_PRINT_AND_IGNORE}, // DMA 2 misc registers -#endif + v3_generic_add_port_range(generic, 0x00, 0x07, GENERIC_PRINT_AND_IGNORE); // DMA 1 channels 0,1,2,3 (address, counter) + v3_generic_add_port_range(generic, 0xc0, 0xc7, GENERIC_PRINT_AND_IGNORE); // DMA 2 channels 4,5,6,7 (address, counter) + v3_generic_add_port_range(generic, 0x87, 0x87, GENERIC_PRINT_AND_IGNORE); // DMA 1 channel 0 page register + v3_generic_add_port_range(generic, 0x83, 0x83, GENERIC_PRINT_AND_IGNORE); // DMA 1 channel 1 page register + v3_generic_add_port_range(generic, 0x81, 0x81, GENERIC_PRINT_AND_IGNORE); // DMA 1 channel 2 page register + v3_generic_add_port_range(generic, 0x82, 0x82, GENERIC_PRINT_AND_IGNORE); // DMA 1 channel 3 page register + v3_generic_add_port_range(generic, 0x8f, 0x8f, GENERIC_PRINT_AND_IGNORE); // DMA 2 channel 4 page register + v3_generic_add_port_range(generic, 0x8b, 0x8b, GENERIC_PRINT_AND_IGNORE); // DMA 2 channel 5 page register + v3_generic_add_port_range(generic, 0x89, 0x89, GENERIC_PRINT_AND_IGNORE); // DMA 2 channel 6 page register + v3_generic_add_port_range(generic, 0x8a, 0x8a, GENERIC_PRINT_AND_IGNORE); // DMA 2 channel 7 page register + v3_generic_add_port_range(generic, 0x08, 0x0f, GENERIC_PRINT_AND_IGNORE); // DMA 1 misc registers (csr, req, smask,mode,clearff,reset,enable,mmask) + v3_generic_add_port_range(generic, 0xd0, 0xde, GENERIC_PRINT_AND_IGNORE); // DMA 2 misc registers + + + - -#if 1 // Make the Serial ports invisible + + v3_generic_add_port_range(generic, 0x3f8, 0x3f8+7, GENERIC_PRINT_AND_IGNORE); // COM 1 + v3_generic_add_port_range(generic, 0x2f8, 0x2f8+7, GENERIC_PRINT_AND_IGNORE); // COM 2 + - {0x3f8, 0x3f8+7, GENERIC_PRINT_AND_IGNORE}, // COM 1 - {0x2f8, 0x2f8+7, GENERIC_PRINT_AND_IGNORE}, // COM 2 - -#endif - -#ifndef DEBUG_RAMDISK + - {0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE}, // COM 3 - {0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE}, // COM 4 -#endif + 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 + + -#if 1 // 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 - {0xcf8, 0xcf8, GENERIC_PRINT_AND_IGNORE}, // PCI Config Address - {0xcfc, 0xcfc, GENERIC_PRINT_AND_IGNORE}, // PCI Config Data -#endif - - -#ifndef RAMDISK_BOOT - - // Monitor the IDE controllers (very slow) - - {0x170, 0x178, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 1 - {0x376, 0x377, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 1 - -#endif + + +#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 - {0x1f0, 0x1f8, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 0 - {0x3f6, 0x3f7, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 0 + 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 - + #if 0 - + // Make the floppy controllers invisible - - {0x3f0, 0x3f2, GENERIC_PRINT_AND_IGNORE}, // Primary floppy controller (base,statusa/statusb,DOR) - {0x3f4, 0x3f5, GENERIC_PRINT_AND_IGNORE}, // Primary floppy controller (mainstat/datarate,data) - {0x3f7, 0x3f7, GENERIC_PRINT_AND_IGNORE}, // Primary floppy controller (DIR) - {0x370, 0x372, GENERIC_PRINT_AND_IGNORE}, // Secondary floppy controller (base,statusa/statusb,DOR) - {0x374, 0x375, GENERIC_PRINT_AND_IGNORE}, // Secondary floppy controller (mainstat/datarate,data) - {0x377, 0x377, GENERIC_PRINT_AND_IGNORE}, // Secondary floppy controller (DIR) + + v3_generic_add_port_range(generic, 0x3f0, 0x3f2, GENERIC_PRINT_AND_IGNORE); // Primary floppy controller (base,statusa/statusb,DOR) + v3_generic_add_port_range(generic, 0x3f4, 0x3f5, GENERIC_PRINT_AND_IGNORE); // Primary floppy controller (mainstat/datarate,data) + v3_generic_add_port_range(generic, 0x3f7, 0x3f7, GENERIC_PRINT_AND_IGNORE); // Primary floppy controller (DIR) + v3_generic_add_port_range(generic, 0x370, 0x372, GENERIC_PRINT_AND_IGNORE); // Secondary floppy controller (base,statusa/statusb,DOR) + v3_generic_add_port_range(generic, 0x374, 0x375, GENERIC_PRINT_AND_IGNORE); // Secondary floppy controller (mainstat/datarate,data) + v3_generic_add_port_range(generic, 0x377, 0x377, GENERIC_PRINT_AND_IGNORE); // Secondary floppy controller (DIR) #endif @@ -254,7 +297,7 @@ int config_guest(struct guest_info * info, void * config_ptr) { // Make the parallel port invisible - {0x378, 0x37f, GENERIC_PRINT_AND_IGNORE}, + v3_generic_add_port_range(generic, 0x378, 0x37f, GENERIC_PRINT_AND_IGNORE); #endif @@ -262,8 +305,8 @@ int config_guest(struct guest_info * info, void * config_ptr) { // Monitor graphics card operations - {0x3b0, 0x3bb, GENERIC_PRINT_AND_PASSTHROUGH}, - {0x3c0, 0x3df, GENERIC_PRINT_AND_PASSTHROUGH}, + v3_generic_add_port_range(generic, 0x3b0, 0x3bb, GENERIC_PRINT_AND_PASSTHROUGH); + v3_generic_add_port_range(generic, 0x3c0, 0x3df, GENERIC_PRINT_AND_PASSTHROUGH); #endif @@ -271,36 +314,31 @@ int config_guest(struct guest_info * info, void * config_ptr) { #if 1 // Make the ISA PNP features invisible - {0x274, 0x277, GENERIC_PRINT_AND_IGNORE}, - {0x279, 0x279, GENERIC_PRINT_AND_IGNORE}, - {0xa79, 0xa79, GENERIC_PRINT_AND_IGNORE}, + v3_generic_add_port_range(generic, 0x274, 0x277, GENERIC_PRINT_AND_IGNORE); + v3_generic_add_port_range(generic, 0x279, 0x279, GENERIC_PRINT_AND_IGNORE); + v3_generic_add_port_range(generic, 0xa79, 0xa79, GENERIC_PRINT_AND_IGNORE); #endif #if 1 // Monitor any network card (realtek ne2000) operations - {0xc100, 0xc1ff, GENERIC_PRINT_AND_PASSTHROUGH}, + v3_generic_add_port_range(generic, 0xc100, 0xc1ff, GENERIC_PRINT_AND_PASSTHROUGH); #endif #if 1 // Make any Bus master ide controller invisible - {0xc000, 0xc00f, GENERIC_PRINT_AND_IGNORE}, + v3_generic_add_port_range(generic, 0xc000, 0xc00f, GENERIC_PRINT_AND_IGNORE); #endif - - - // {0x378, 0x400, GENERIC_PRINT_AND_IGNORE} - {0,0,0}, // sentinal - must be last + } + // v3_generic_add_port_range(generic, 0x378, 0x400, GENERIC_PRINT_AND_IGNORE); - }; - - struct vm_device * generic = create_generic(range, NULL, NULL); - -#endif + + v3_attach_device(info, nvram); //v3_attach_device(info, timer); v3_attach_device(info, pic); @@ -308,16 +346,15 @@ int config_guest(struct guest_info * info, void * config_ptr) { v3_attach_device(info, keyboard); // v3_attach_device(info, serial); -//Zheng 09/29/2008 -#ifdef RAMDISK_BOOT - v3_attach_device(info, ramdisk); -#endif + if (use_ramdisk) { + v3_attach_device(info, ramdisk); + v3_attach_device(info, cdrom); + } -#if GENERIC - // Important that this be attached last! - v3_attach_device(info, generic); - -#endif + if (use_generic) { + // Important that this be attached last! + v3_attach_device(info, generic); + } PrintDebugDevMgr(info); } @@ -326,22 +363,21 @@ int config_guest(struct guest_info * info, void * config_ptr) { // no longer needed since we have a keyboard device //hook_irq(&vm_info, 1); -#if 1 +#if 0 // give floppy controller to vm - v3_hook_irq_for_guest_injection(info, 6); + v3_hook_passthrough_irq(info, 6); #endif -#if 1 - //primary ide - v3_hook_irq_for_guest_injection(info, 14); - -#endif -#ifndef RAMDISK_BOOT - // secondary ide - v3_hook_irq_for_guest_injection(info, 15); -#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); + } //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);