#include <devices/generic.h>
#include <devices/ramdisk.h>
#include <devices/cdrom.h>
+#include <devices/bochs_debug.h>
+#include <palacios/vmm_host_events.h>
+
#define USE_GENERIC 1
#define MAGIC_CODE 0xf1e2d3c4
}
-/*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 config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
+int v3_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;
+ uint_t i;
int use_ramdisk = config_ptr->use_ramdisk;
int use_generic = USE_GENERIC;
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;
}
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);
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();
+ 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;
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)
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);
if (!use_ramdisk) {
+ PrintDebug("Hooking IDE IRQs\n");
+
//primary ide
v3_hook_passthrough_irq(info, 14);