X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=01fcaf7b4d389679940c6b9669152f361409a9b7;hp=3bbac8887d4dcb2536cd069d806a0073b92e6b82;hb=c535b3199977444c3aa2c44b852cc82ce659c5ff;hpb=5b6278751429f59297ce74e614d50632daea3748 diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index 3bbac88..01fcaf7 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -21,6 +21,10 @@ #include #include #include +#include +#include +#include +#include #include @@ -29,9 +33,16 @@ #include #include #include -#include -#include +#include +#include +#include #include +#include +#include +#include +#include +#include + #include @@ -39,324 +50,440 @@ #define USE_GENERIC 1 -#define ROMBIOS_START 0x000f0000 -#define VGABIOS_START 0x000c0000 +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 mem_test_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) { - int foo = 20; - memcpy(dst, &foo, length); - PrintDebug("Passthrough mem read returning: %p (length=%d)\n", (void *)(foo + (guest_addr & 0xfff)), length); - return length; -} +static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) { -static int passthrough_mem_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) { - memcpy(dst, (void*)guest_addr, length); return length; -} - -static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) { - memcpy((void*)guest_addr, src, length); - return length; + // memcpy((void*)guest_addr, src, length); + PrintDebug("Write of %d bytes to %p\n", length, (void *)guest_addr); + PrintDebug("Write Value = %p\n", (void *)*(addr_t *)src); + + return length; } int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) { - extern v3_cpu_arch_t v3_cpu_type; - - - int use_ramdisk = config_ptr->use_ramdisk; - int use_generic = USE_GENERIC; + extern v3_cpu_arch_t v3_cpu_type; + + // Initialize the subsystem data strutures + v3_init_time(info); + v3_init_io_map(info); + v3_init_msr_map(info); + v3_init_interrupt_state(info); + v3_init_dev_mgr(info); + v3_init_host_events(info); + + v3_init_decoder(info); + + v3_init_shadow_map(info); + + v3_init_hypercall_map(info); + + 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; + } + + // Initial CPU operating mode + info->cpu_mode = REAL; + info->mem_mode = PHYSICAL_MEM; + + // Amount of ram the Guest will have, rounded to a 4K page boundary + info->mem_size = config_ptr->mem_size & ~(addr_t)0xfff; + + // Configure the memory map for the guest + if (setup_memory_map(info, config_ptr) == -1) { + PrintError("Setting up guest memory map failed...\n"); + return -1; + } + + // Configure the devices for the guest + setup_devices(info, config_ptr); + - v3_init_time(info); - init_shadow_map(info); - - if (v3_cpu_type == V3_SVM_REV3_CPU) { - info->shdw_pg_mode = NESTED_PAGING; - } else { - v3_init_shadow_page_state(info); - info->shdw_pg_mode = SHADOW_PAGING; - } - - info->cpu_mode = REAL; - info->mem_mode = PHYSICAL_MEM; - - - v3_init_vmm_io_map(info); - v3_init_msr_map(info); - v3_init_interrupt_state(info); - - v3_init_dev_mgr(info); + if (config_ptr->enable_profiling) { + info->enable_profiler = 1; + v3_init_profiler(info); + } else { + info->enable_profiler = 0; + } - v3_init_emulator(info); + //v3_hook_io_port(info, 1234, &IO_Read, NULL, info); + + // Setup initial cpu register state + info->rip = 0xfff0; + info->vm_regs.rsp = 0x0; - v3_init_host_events(info); + + return 0; +} - - /* layout rombios */ - { - uint_t num_pages = (config_ptr->rombios_size + PAGE_SIZE - 1) / PAGE_SIZE; - void * guest_mem = V3_AllocPages(num_pages); +/* TODO: + * The amount of guest memory is stored in info->mem_size + * 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) { + addr_t mem_pages = info->mem_size >> 12; + + PrintDebug("Setting up memory map (memory size=%dMB)\n", (uint_t)(info->mem_size / (1024 * 1024))); + + // Fill up to the 640K hole + if (mem_pages >= 160) { + if (v3_add_shadow_mem(info, 0x0, 0xa0000, (addr_t)V3_AllocPages(160)) == -1) { + PrintError("Could not map full conventional memory\n"); + return -1; + } + } else { + // Less than 640k of memory + if (v3_add_shadow_mem(info, 0x0, (mem_pages * PAGE_SIZE), (addr_t)V3_AllocPages(mem_pages)) == -1) { + PrintError("Could not map subset of conventional memory\n"); + return -1; + }; + } - PrintDebug("Layout Region %d bytes\n", config_ptr->rombios_size); - memcpy(V3_VAddr(guest_mem), config_ptr->rombios, config_ptr->rombios_size); - add_shadow_region_passthrough(info, ROMBIOS_START, ROMBIOS_START + (num_pages * PAGE_SIZE), (addr_t)guest_mem); +#define VGABIOS_START 0x000c0000 +#define ROMBIOS_START 0x000f0000 + + // VGA frame buffer + if (1) { + if (v3_add_shadow_mem(info, 0xa0000, 0xc0000, 0xa0000) == -1) { + PrintError("Could not map VGA framebuffer\n"); + return -1; + } + } else { + v3_hook_write_mem(info, 0xa0000, 0xc0000, 0xa0000, passthrough_mem_write, NULL); + } - PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", - (void *)ROMBIOS_START, - (void *)ROMBIOS_START + (num_pages * PAGE_SIZE), - (void *)guest_mem); - } + + /* layout vgabios */ + { + uint_t num_pages = (config_ptr->vgabios_size + PAGE_SIZE - 1) / PAGE_SIZE; + void * guest_mem = V3_AllocPages(num_pages); + addr_t vgabios_end = VGABIOS_START + (num_pages * PAGE_SIZE); + + PrintDebug("Layout Region %d bytes\n", config_ptr->vgabios_size); + memcpy(V3_VAddr(guest_mem), config_ptr->vgabios, config_ptr->vgabios_size); + + if (v3_add_shadow_mem(info, VGABIOS_START, vgabios_end, (addr_t)guest_mem) == -1) { + PrintError("Could not map VGABIOS\n"); + return -1; + } + + PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", + (void *)VGABIOS_START, + (void *)vgabios_end, + (void *)guest_mem); + + + // Fill in the space between the VGABIOS and the ROMBIOS + // We'll just back this to shadow memory for now.... + if (v3_add_shadow_mem(info, vgabios_end, ROMBIOS_START, + (addr_t)V3_AllocPages((ROMBIOS_START - vgabios_end) / PAGE_SIZE)) == -1) { + PrintError("Could not map VGABIOS->ROMBIOS gap\n"); + return -1; + } + } + + /* layout rombios */ + { + uint_t num_pages = (config_ptr->rombios_size + PAGE_SIZE - 1) / PAGE_SIZE; + void * guest_mem = V3_AllocPages(num_pages); + addr_t rombios_end = ROMBIOS_START + (num_pages * PAGE_SIZE); + + PrintDebug("Layout Region %d bytes\n", config_ptr->rombios_size); + memcpy(V3_VAddr(guest_mem), config_ptr->rombios, config_ptr->rombios_size); + + if (v3_add_shadow_mem(info, ROMBIOS_START, rombios_end, (addr_t)guest_mem) == -1) { + PrintError("Could not map ROMBIOS\n"); + return -1; + } + + PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", + (void *)ROMBIOS_START, + (void *)rombios_end, + (void *)guest_mem); + + if (rombios_end != 0x100000) { + PrintError("ROMBIOS must reach the 1MB barrier....\n"); + return -1; + } + } +#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); + + if (num_ext_pages > 0) { + if (v3_add_shadow_mem(info, 0x100000, info->mem_size, (addr_t)V3_AllocPages(num_ext_pages)) == -1) { + PrintError("Could not allocate extended shadow memory\n"); + return -1; + } + } + } +#endif - /* layout vgabios */ - { - uint_t num_pages = (config_ptr->vgabios_size + PAGE_SIZE - 1) / PAGE_SIZE; - void * guest_mem = V3_AllocPages(num_pages); + print_shadow_map(info); - PrintDebug("Layout Region %d bytes\n", config_ptr->vgabios_size); - memcpy(V3_VAddr(guest_mem), config_ptr->vgabios, config_ptr->vgabios_size); + return 0; +} - add_shadow_region_passthrough(info, VGABIOS_START, VGABIOS_START + (num_pages * PAGE_SIZE), (addr_t)guest_mem); - - PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n", - (void *)VGABIOS_START, - (void *)VGABIOS_START + (num_pages * PAGE_SIZE), - (void *)guest_mem); - } - // - add_shadow_region_passthrough(info, 0x0, 0xa0000, (addr_t)V3_AllocPages(160)); - - if (1) { - add_shadow_region_passthrough(info, 0xa0000, 0xc0000, 0xa0000); - } else { - hook_guest_mem(info, 0xa0000, 0xc0000, passthrough_mem_read, passthrough_mem_write, NULL); - } - - // TEMP - //add_shadow_region_passthrough(info, 0xc0000, 0xc8000, 0xc0000); - - if (1) { - add_shadow_region_passthrough(info, 0xc7000, 0xc8000, (addr_t)V3_AllocPages(1)); - if (add_shadow_region_passthrough(info, 0xc8000, 0xf0000, (addr_t)V3_AllocPages(40)) == -1) { - PrintDebug("Error adding shadow region\n"); - } - } else { - add_shadow_region_passthrough(info, 0xc0000, 0xc8000, 0xc0000); - add_shadow_region_passthrough(info, 0xc8000, 0xf0000, 0xc8000); - } - - - if (1) { - add_shadow_region_passthrough(info, 0x100000, 0x1000000, (addr_t)V3_AllocPages(4096)); - } else { - /* MEMORY HOOK TEST */ - add_shadow_region_passthrough(info, 0x100000, 0xa00000, (addr_t)V3_AllocPages(2304)); - hook_guest_mem(info, 0xa00000, 0xa01000, mem_test_read, passthrough_mem_write, NULL); - add_shadow_region_passthrough(info, 0xa01000, 0x1000000, (addr_t)V3_AllocPages(1791)); - } - - add_shadow_region_passthrough(info, 0x1000000, 0x8000000, (addr_t)V3_AllocPages(32768)); - - // test - give linux accesss to PCI space - PAD - add_shadow_region_passthrough(info, 0xc0000000,0xffffffff,0xc0000000); - - - print_shadow_map(&(info->mem_map)); - - { - struct vm_device * ramdisk = NULL; - struct vm_device * cdrom = NULL; + +static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) { + struct vm_device * ide = NULL; + //struct vm_device * ram_cd = NULL; + struct vm_device * ram_hd = NULL; + struct vm_device * pci = v3_create_pci(); 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 * 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; - + ide = v3_create_ide(pci); if (use_ramdisk) { - PrintDebug("Creating Ramdisk\n"); - ramdisk = v3_create_ramdisk(); - cdrom = v3_create_cdrom(ramdisk, config_ptr->ramdisk, config_ptr->ramdisk_size); + PrintDebug("Creating Ramdisk\n"); + //ram_cd = v3_create_ram_cd(ide, 0, 0, + // (addr_t)(config_ptr->ramdisk), + // config_ptr->ramdisk_size); + ram_hd = v3_create_ram_hd(ide, 0, 0, + (addr_t)(config_ptr->ramdisk), + config_ptr->ramdisk_size); } if (use_generic) { - PrintDebug("Creating Generic Device\n"); - 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) - 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 - - - - - // 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 - + generic = configure_generic(info, config_ptr); + } - - 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 + v3_attach_device(info, pci); - - + 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); + // 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); + + v3_attach_device(info, ide); + + if (use_ramdisk) { + // v3_attach_device(info, ram_cd); + v3_attach_device(info, ram_hd); + } + + if (use_generic) { + // Important that this be attached last! + v3_attach_device(info, generic); + } + + 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; +} + + + +static struct vm_device * configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr) { + PrintDebug("Creating Generic Device\n"); + struct vm_device * 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) + 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 + + + + + // 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 + - // 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, 0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE); // COM 3 + v3_generic_add_port_range(generic, 0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE); // COM 4 + + // 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 + + + #if 0 - if (!use_ramdisk) { + 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 - } + } - 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 + 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 - - 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) - + + // Make the floppy controllers invisible + + 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 #if 1 - // Make the parallel port invisible + // Make the parallel port invisible - v3_generic_add_port_range(generic, 0x378, 0x37f, GENERIC_PRINT_AND_IGNORE); + v3_generic_add_port_range(generic, 0x378, 0x37f, GENERIC_PRINT_AND_IGNORE); #endif #if 1 - // Monitor graphics card operations - - v3_generic_add_port_range(generic, 0x3b0, 0x3bb, GENERIC_PRINT_AND_PASSTHROUGH); - v3_generic_add_port_range(generic, 0x3c0, 0x3df, GENERIC_PRINT_AND_PASSTHROUGH); + // Monitor graphics card operations + + 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 #if 1 - // Make the ISA PNP features invisible - - 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); + // Make the ISA PNP features invisible + + 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 - v3_generic_add_port_range(generic, 0xc100, 0xc1ff, GENERIC_PRINT_AND_PASSTHROUGH); + // Monitor any network card (realtek ne2000) operations + v3_generic_add_port_range(generic, 0xc100, 0xc1ff, GENERIC_PRINT_AND_PASSTHROUGH); #endif #if 1 - // Make any Bus master ide controller invisible - - v3_generic_add_port_range(generic, 0xc000, 0xc00f, GENERIC_PRINT_AND_IGNORE); -#endif - - } - // v3_generic_add_port_range(generic, 0x378, 0x400, GENERIC_PRINT_AND_IGNORE); - - - + // Make any Bus master ide controller invisible - - 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); - // 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) { - // Important that this be attached last! - v3_attach_device(info, generic); - } - - 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); + v3_generic_add_port_range(generic, 0xc000, 0xc00f, GENERIC_PRINT_AND_IGNORE); #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); - - info->rip = 0xfff0; - info->vm_regs.rsp = 0x0; - + // v3_generic_add_port_range(generic, 0x378, 0x400, GENERIC_PRINT_AND_IGNORE); + - return 0; + return generic; }