-/*
+ /*
* 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.
#include <palacios/vmm_debug.h>
#include <palacios/vmm_msr.h>
#include <palacios/vmm_decoder.h>
-#include <palacios/vmm_profiler.h>
+#include <palacios/vmm_telemetry.h>
#include <palacios/vmm_mem.h>
#include <palacios/vmm_hypercall.h>
+#include <palacios/vmm_dev_mgr.h>
+#include <palacios/vmm_cpuid.h>
+#include <palacios/vmm_xml.h>
+#ifdef CONFIG_SYMBIOTIC
+#include <palacios/vmm_sym_iface.h>
+
+#ifdef CONFIG_SYMBIOTIC_SWAP
+#include <palacios/vmm_sym_swap.h>
+#endif
+
+#endif
-#include <devices/serial.h>
-#include <devices/keyboard.h>
-#include <devices/8259a.h>
-#include <devices/8254.h>
-#include <devices/nvram.h>
#include <devices/generic.h>
-#include <devices/ramdisk.h>
-#include <devices/cdrom.h>
-#include <devices/bochs_debug.h>
-#include <devices/os_debug.h>
-#include <devices/apic.h>
-#include <devices/io_apic.h>
-#include <devices/para_net.h>
-#include <devices/pci.h>
+#include <devices/ide.h>
+#include <devices/ram_cd.h>
+#include <devices/net_cd.h>
+#include <devices/ram_hd.h>
+#include <devices/net_hd.h>
+#include <devices/telnet_cons.h>
+#include <devices/pci_passthrough.h>
-#include <palacios/vmm_host_events.h>
+/*
+static const char * test_cfg_xml = \
+"<root>\n \
+<memory>2048</memory>\n\
+<devices>\n\
+<device id=\"PCI\" />\n\
+<device id=\"IDE\" />\n\
+</devices>\n\
+</root>";
+*/
+
-#define USE_GENERIC 1
+
+#include <palacios/vmm_host_events.h>
+#include <palacios/vmm_socket.h>
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);
+#ifdef CONFIG_PASSTHROUGH_VIDEO
static int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) {
return length;
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_types[];
+
+
+ /*
+ {
+ struct v3_xml * cfg = v3_xml_parse((char *)test_cfg_xml);
+ struct v3_xml * devs = NULL;
+ struct v3_xml * tmp = NULL;
+ PrintError("Parsed XML COnfig %s\n", v3_xml_name(cfg));
+
+ PrintError("memory=%s\n", v3_xml_txt(v3_xml_child(cfg, "memory")));
+
+ devs = v3_xml_child(cfg, "devices");
+
+ for (tmp = v3_xml_child(devs, "device"); tmp; tmp = v3_xml_next(tmp)) {
+ PrintError("Device: %s, id=%s\n",
+ v3_xml_name(tmp),
+ v3_xml_attr(tmp, "id"));
+ }
+ v3_xml_free(cfg);
+
+ return -1;
+ }
+ */
+ // Amount of ram the Guest will have, rounded to a 4K page boundary
+ info->mem_size = config_ptr->mem_size & ~(addr_t)0xfff;
-int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
- extern v3_cpu_arch_t v3_cpu_type;
+ info->cpu_id = config_ptr->guest_cpu;
- // Initialize the subsystem data strutures
- v3_init_time(info);
+ /*
+ * Initialize the subsystem data strutures
+ */
+#ifdef CONFIG_TELEMETRY
+ // This should go first, because other subsystems will depend on the guest_info flag
+ if (config_ptr->enable_telemetry) {
+ info->enable_telemetry = 1;
+ v3_init_telemetry(info);
+ } else {
+ info->enable_telemetry = 0;
+ }
+#endif
+
+ v3_init_hypercall_map(info);
v3_init_io_map(info);
v3_init_msr_map(info);
- v3_init_interrupt_state(info);
- v3_init_dev_mgr(info);
+ v3_init_cpuid_map(info);
v3_init_host_events(info);
+
+ // Initialize the memory map
+ if (v3_init_shadow_map(info) == -1) {
+ PrintError("Could not initialize shadow map\n");
+ return -1;
+ }
- v3_init_decoder(info);
-
- v3_init_shadow_map(info);
-
- v3_init_hypercall_map(info);
-
-
- if (v3_cpu_type == V3_SVM_REV3_CPU) {
+ if ((v3_cpu_types[info->cpu_id] == 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;
}
+
+#ifdef CONFIG_SYMBIOTIC
+ v3_init_sym_iface(info);
+#endif
+
+ v3_init_time(info);
+ v3_init_interrupt_state(info);
+ v3_init_exception_state(info);
+ v3_init_dev_mgr(info);
+ v3_init_decoder(info);
+
+#ifdef CONFIG_SYMBIOTIC_SWAP
+ PrintDebug("initializing symbiotic swap\n");
+ v3_init_sym_swap(info);
+#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;
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;
-
+
+ return 0;
+}
+
+
+int v3_post_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
+
// 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_hook_io_port(info, 1234, &IO_Read, NULL, info);
+
+ if (setup_devices(info, config_ptr) == -1) {
+ PrintError("Failed to setup devices\n");
+ return -1;
+ }
+ // v3_print_io_map(info);
+ v3_print_msr_map(info);
- if (config_ptr->enable_profiling) {
- info->enable_profiler = 1;
- v3_init_profiler(info);
- } else {
- info->enable_profiler = 0;
- }
+ info->run_state = VM_STOPPED;
+
+ info->vm_regs.rdi = 0;
+ info->vm_regs.rsi = 0;
+ info->vm_regs.rbp = 0;
+ info->vm_regs.rsp = 0;
+ info->vm_regs.rbx = 0;
+ info->vm_regs.rdx = 0;
+ info->vm_regs.rcx = 0;
+ info->vm_regs.rax = 0;
- //v3_hook_io_port(info, 1234, &IO_Read, NULL, info);
-
- // Setup initial cpu register state
- info->rip = 0xfff0;
- info->vm_regs.rsp = 0x0;
-
-
return 0;
}
+
+
+
/* 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;
- };
- }
-
-#define VGABIOS_START 0x000c0000
-#define ROMBIOS_START 0x000f0000
+#ifdef CONFIG_PASSTHROUGH_VIDEO
+ PrintDebug("Setting up memory map (memory size=%dMB)\n", (uint_t)(info->mem_size / (1024 * 1024)));
// VGA frame buffer
if (1) {
}
} else {
v3_hook_write_mem(info, 0xa0000, 0xc0000, 0xa0000, passthrough_mem_write, NULL);
- }
-
-
+ }
+#endif
+
+#define VGABIOS_START 0x000c0000
+#define ROMBIOS_START 0x000f0000
+
/* 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);
-
+ extern uint8_t v3_vgabios_start[];
+ extern uint8_t v3_vgabios_end[];
- // 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;
- }
+ addr_t vgabios_dst = v3_get_shadow_addr(&(info->mem_map.base_region), VGABIOS_START);
+ memcpy(V3_VAddr((void *)vgabios_dst), v3_vgabios_start, v3_vgabios_end - v3_vgabios_start);
}
/* 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;
- }
+ 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), v3_rombios_start, v3_rombios_end - v3_rombios_start);
}
-#ifdef CRAY_XT
+#ifdef CONFIG_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
+#endif
- print_shadow_map(info);
+ v3_print_mem_map(info);
return 0;
}
static int setup_devices(struct guest_info * info, struct v3_vm_config * config_ptr) {
- struct vm_device * ramdisk = NULL;
- struct vm_device * cdrom = NULL;
-#ifdef DEBUG_PCI
- struct vm_device * pci = v3_create_pci();
-#endif
- 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;
-
-
- if (use_ramdisk) {
- PrintDebug("Creating Ramdisk\n");
- ramdisk = v3_create_ramdisk();
- cdrom = v3_create_cdrom(ramdisk, config_ptr->ramdisk, config_ptr->ramdisk_size);
- }
-
+
+ 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);
- if (use_generic) {
- generic = configure_generic(info, config_ptr);
+
+ v3_create_device(info, "CGA_VIDEO", (void *)1);
+ {
+ struct telnet_cons_cfg cons_cfg = {"CGA_VIDEO", 19997};
+ v3_create_device(info, "TELNET_CONSOLE", &cons_cfg);
}
-#ifdef DEBUG_PCI
- v3_attach_device(info, pci);
-#endif
+ if (config_ptr->enable_pci == 1) {
+ struct ide_cfg ide_config = {"PCI", "PIIX3"};
+ struct pci_passthrough_cfg pci_qemu_pt_cfg = {"PCI", "E1000", 0x8086, 0x100e};
+ struct pci_passthrough_cfg pci_hw_pt_cfg = {"PCI", "E1000", 0x8086, 0x107c};
+
+ v3_create_device(info, "PCI", NULL);
+ v3_create_device(info, "i440FX", "PCI");
+ v3_create_device(info, "PIIX3", "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_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");
+ // v3_create_device(info, "TMP_BLK", "LNX_VIRTIO_BLK");
- v3_attach_device(info, apic);
- v3_attach_device(info, ioapic);
+ v3_create_device(info, "IDE", &ide_config);
+
+ v3_create_device(info, "PCI_PASSTHROUGH", &pci_qemu_pt_cfg);
+ v3_create_device(info, "PCI_PASSTHROUGH", &pci_hw_pt_cfg);
- v3_attach_device(info, para_net);
- if (use_ramdisk) {
- v3_attach_device(info, ramdisk);
- v3_attach_device(info, cdrom);
+ } else {
+ v3_create_device(info, "IDE", NULL);
}
- if (use_generic) {
- // Important that this be attached last!
- v3_attach_device(info, generic);
+
+ 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);
+ }
+
+ } else if (config_ptr->pri_disk_type == VIRTIO) {
+ if (config_ptr->pri_disk_con == RAM) {
+ struct ram_hd_cfg cfg = {"LNX_VIRTIO_BLK", 0, 0,
+ (addr_t)(config_ptr->pri_disk_info.ram.data_ptr),
+ config_ptr->pri_disk_info.ram.size};
+
+ PrintDebug("Creating Virtio RAM HD\n");
+
+ v3_create_device(info, "RAM-HD", &cfg);
+ }
+
+ }
}
-
- 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);
+
+ 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);
+ }
+ }
+ }
+
+
+
+#ifdef CONFIG_GENERIC
+ configure_generic(info, config_ptr);
#endif
+
+ // This should go last because it requires information about the Harddrives
+ v3_create_device(info, "NVRAM", "IDE");
-
- if (!use_ramdisk) {
- PrintDebug("Hooking IDE IRQs\n");
-
- //primary ide
- v3_hook_passthrough_irq(info, 14);
-
- // secondary ide
- v3_hook_passthrough_irq(info, 15);
- }
-
+ PrintDebugDevMgr(info);
return 0;
}
-static struct vm_device * configure_generic(struct guest_info * info, struct v3_vm_config * config_ptr) {
+#ifdef CONFIG_GENERIC
+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)
+
+
// 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)
// 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
#endif
-#if 1
+#ifdef CONFIG_PASTHROUGH_VIDEO
// Monitor graphics card 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);
-
- return generic;
+ return 0;
}
+#endif
