#include <devices/ide.h>
+ #ifndef TRACE_RAMDISK
+ #undef PrintTrace
+ #define PrintTrace(fmt, args...)
+ #endif
+
+
#ifndef DEBUG_RAMDISK
#undef PrintDebug
- #define PrintDebug(_f, _a...)
+ #define PrintDebug(fmt, args...)
#endif
* Interrupt handling
*/
static void rd_raise_interrupt(struct vm_device * dev, struct channel_t * channel);
- static void rd_lower_irq(struct vm_device *dev, Bit32u irq);
+ static void rd_lower_irq(struct vm_device *dev, struct channel_t * channel);
static void rd_print_state(struct ramdisk_t *ramdisk);
static int check_bit_fields(struct controller_t * controller);
#endif
+
+
////////////////////////////////////////////////////////////////////
drive->private_data = private_data;
+
#ifdef DEBUG_RAMDISK
if (check_bit_fields(controller) == INTR_REASON_BIT_ERR) {
- PrintDebug("interrupt reason: bit field error\n");
+ PrintError("interrupt reason: bit field error\n");
return INTR_REASON_BIT_ERR;
}
#endif
controller = &(drive->controller);
- PrintDebug("[read_data_handler] IO Read at 0x%x, on drive %d/%d (current_cmd = 0x%02x)\n",
+ PrintTrace("[read_data_handler] IO Read at 0x%x, on drive %d/%d current cmd=0x%x\n",
port,
get_channel_no(ramdisk, channel),
get_drive_no(channel, drive),
uint_t index = controller->buffer_index;
- PrintDebug("\t\tatapi.command(%02x), index(%d), cdrom.remaining_blocks(%d)\n",
+ PrintTrace("\t\tatapi.command(%02x), index(%d), cdrom.remaining_blocks(%d)\n",
drive->atapi.command,
index,
drive->cdrom.remaining_blocks);
}
default:
- PrintDebug("\t\tread need support more command: %02x\n", controller->current_command);
+ PrintError("\t\tunsupported command: %02x\n", controller->current_command);
break;
}
case 0xa0: // PACKET
if (handle_atapi_packet_command(dev, channel, *(ushort_t *)src) == -1) {
+ PrintError("Error sending atapi packet command in PACKET write to data port\n");
return -1;
}
if (num_drives_on_channel(channel) == 0) {
+ PrintDebug("Setting value to zero because 0 devices on channel\n");
// (mch) Just return zero for these registers
memset(dst, 0, length);
}
if ((port == SEC_CMD_PORT) || (port == PRI_CMD_PORT)) {
- rd_lower_irq(dev, channel->irq);
+ rd_lower_irq(dev, channel);
}
PrintDebug("\t\tRead STATUS = 0x%x\n", *(uchar_t *)dst);
PrintDebug("[write_command_handler] IO write at 0x%x, on drive %d/%d (val = 0x%x)\n",
port, get_channel_no(ramdisk, channel),
- channel->drive_select,
+ get_drive_no(channel, drive),
value);
switch (value) {
+ #if 0
+ case 0xec: // IDENTIFY DEVICE
+ {
+
+ if (drive->device_type == IDE_NONE) {
+ PrintError("\t\tError: disk ata%d-%d not present, aborting\n",
+ get_channel_no(ramdisk, channel),
+ get_drive_no(channel, drive));
+ rd_command_aborted(dev, channel, value);
+ break;
+ } else if (drive->device_type == IDE_CDROM) {
+ PrintDebug("Identifying CDROM...Going to abort????\n");
+ controller->head_no = 0;
+ controller->sector_count = 1;
+ controller->sector_no = 1;
+ controller->cylinder_no = 0xeb14;
+ rd_command_aborted(dev, channel, 0xec);
+ } else {
+ PrintError("\t\tError: Want to identify HDD!!\n");
+ /*
+ SELECTED_CONTROLLER(channel).current_command = value;
+ SELECTED_CONTROLLER(channel).error_register = 0;
+
+ // See ATA/ATAPI-4, 8.12
+ SELECTED_CONTROLLER(channel).status.busy = 0;
+ SELECTED_CONTROLLER(channel).status.drive_ready = 1;
+ SELECTED_CONTROLLER(channel).status.write_fault = 0;
+ SELECTED_CONTROLLER(channel).status.drq = 1;
+ SELECTED_CONTROLLER(channel).status.err = 0;
+
+ SELECTED_CONTROLLER(channel).status.seek_complete = 1;
+ SELECTED_CONTROLLER(channel).status.corrected_data = 0;
+
+ SELECTED_CONTROLLER(channel).buffer_index = 0;
+ raise_interrupt(channel);
+ identify_drive(channel);
+ */
+ }
+
+ break;
+ }
+ #endif
// ATAPI commands
case 0xa1: // IDENTIFY PACKET DEVICE
{
rd_raise_interrupt(dev, channel);
rd_identify_ATAPI_drive(dev, channel);
} else {
+ PrintError("Identifying non cdrom device not supported - ata %d/%d\n",
+ get_channel_no(ramdisk, channel),
+ get_drive_no(channel, drive));
rd_command_aborted(dev, channel, 0xa1);
}
break;
controller->current_command = value;
controller->buffer_index = 0;
} else {
+ PrintError("Sending packet to non cdrom device not supported\n");
rd_command_aborted (dev, channel, 0xa0);
}
break;
}
default:
- PrintError("\t\tneed translate command %2x\n", value);
+ PrintError("\t\tneed translate command %2x - ata %d\%d\n", value,
+ get_channel_no(ramdisk, channel),
+ get_drive_no(channel, drive));
//return -1;
/* JRL THIS NEEDS TO CHANGE */
return length;
ctrl->control.disable_irq = 0;
}
- rd_lower_irq(dev, channel->irq);
+ rd_lower_irq(dev, channel);
} else if ((controller->reset_in_progress) &&
(!controller->control.reset)) {
drive = get_selected_drive(channel);
if (drive->device_type == IDE_NONE) {
- PrintDebug("\t\tError: device set to %d which does not exist! channel = 0x%x\n",
+ PrintError("\t\tError: device set to %d which does not exist! channel = 0x%x\n",
channel->drive_select, get_channel_no(ramdisk, channel));
controller->error_register = 0x04; // aborted
static void rd_raise_interrupt(struct vm_device * dev, struct channel_t * channel) {
- Bit32u irq;
// struct ramdisk_t * ramdisk = (struct ramdisk_t *)(dev->private_data);
struct drive_t * drive = get_selected_drive(channel);
struct controller_t * controller = &(drive->controller);
- PrintDebug("[raise_interrupt] disable_irq = %02x\n", controller->control.disable_irq);
+ PrintDebug("[raise_interrupt] disable_irq = 0x%02x\n", controller->control.disable_irq);
if (!(controller->control.disable_irq)) {
- irq = channel->irq;
- PrintDebug("\t\tRaising interrupt %d {%s}\n\n", irq, device_type_to_str(drive->device_type));
+ PrintDebug("\t\tRaising interrupt %d {%s}\n\n", channel->irq, device_type_to_str(drive->device_type));
- dev->vm->vm_ops.raise_irq(dev->vm, irq);
+ v3_raise_irq(dev->vm, channel->irq);
} else {
- PrintDebug("\t\tirq is disabled\n");
+ PrintDebug("\t\tRaising irq but irq is disabled\n");
}
return;
}
- static void rd_lower_irq(struct vm_device *dev, Bit32u irq) // __attribute__(regparm(1))
- {
- PrintDebug("[lower_irq] irq = %d\n", irq);
- dev->vm->vm_ops.lower_irq(dev->vm, irq);
+ static void rd_lower_irq(struct vm_device *dev, struct channel_t * channel) {
+ PrintDebug("[lower_irq] irq = %d\n", channel->irq);
+ v3_lower_irq(dev->vm, channel->irq);
}
switch (atapi_command) {
case 0x00: // test unit ready
{
+ PrintDebug("Testing unit ready\n");
if (drive->cdrom.ready) {
rd_atapi_cmd_nop(dev, channel);
} else {
+ PrintError("CDROM not ready in test unit ready\n");
rd_atapi_cmd_error(dev, channel, SENSE_NOT_READY, ASC_MEDIUM_NOT_PRESENT);
}
int alloc_length = controller->buffer[4];
if (rd_init_send_atapi_command(dev, channel, atapi_command, 18, alloc_length, false) == -1) {
+ PrintError("Error sending atapi command in Request Sense\n");
return -1;
}
rd_atapi_cmd_nop(dev, channel);
rd_raise_interrupt(dev, channel);
+
} else if (!LoEj && Start) { // start (spin up) the disc
drive->cdrom.cd->start_cdrom(drive->private_data);
PrintError("FIXME: ATAPI start disc not reading TOC\n");
rd_atapi_cmd_nop(dev, channel);
rd_raise_interrupt(dev, channel);
+
} else if (LoEj && !Start) { // Eject the disc
rd_atapi_cmd_nop(dev, channel);
-
+ PrintDebug("Ejecting Disk\n");
if (drive->cdrom.ready) {
drive->cdrom.cd->eject_cdrom(drive->private_data);
//bx_gui->update_drive_status_buttons();
}
rd_raise_interrupt(dev, channel);
+
} else { // Load the disc
// My guess is that this command only closes the tray, that's a no-op for us
rd_atapi_cmd_nop(dev, channel);
}
if (rd_init_send_atapi_command(dev, channel, atapi_command, 8, alloc_length, false) == -1) {
+ PrintError("Error sending atapi command in mechanism status\n");
return -1;
}
{
if (rd_init_send_atapi_command(dev, channel, atapi_command, sizeof(struct error_recovery_t) + 8, alloc_length, false) == -1) {
+ PrintError("Error sending atapi command in mode sense error recovery\n");
return -1;
}
{
if (rd_init_send_atapi_command(dev, channel, atapi_command, 28, alloc_length, false) == -1) {
+ PrintError("Error sending atapi command in CDROM caps/mech mode-sense\n");
return -1;
}
default:
{
// not implemeted by this device
- PrintDebug("\t\tcdrom: MODE SENSE PC=%x, PageCode=%x, not implemented by device\n",
+ PrintError("\t\tcdrom: MODE SENSE PC=%x, PageCode=%x, not implemented by device\n",
PC, PageCode);
rd_atapi_cmd_error(dev, channel, SENSE_ILLEGAL_REQUEST,
ASC_INV_FIELD_IN_CMD_PACKET);
default:
{
// not implemeted by this device
+ PrintError("Changeable values of mode sense not supported by cdrom\n");
PrintDebug("\t\tcdrom: MODE SENSE PC=%x, PageCode=%x, not implemented by device\n",
PC, PageCode);
rd_atapi_cmd_error(dev, channel, SENSE_ILLEGAL_REQUEST,
case 0x0e: // CD-ROM audio control
case 0x2a: // CD-ROM capabilities & mech. status
case 0x3f: // all
- PrintError("cdrom: MODE SENSE (dflt), code=%x\n",
+ PrintError("Default values of mode sense not supported by cdrom\n");
+ PrintDebug("cdrom: MODE SENSE (dflt), code=%x\n",
PageCode);
return -1;
default:
{
+ PrintError("Default values of mode sense not implemented in cdrom\n");
// not implemeted by this device
- PrintDebug("\t\tcdrom: MODE SENSE PC=%x, PageCode=%x, not implemented by device\n",
- PC, PageCode);
+ PrintDebug("cdrom: MODE SENSE PC=%x, PageCode=%x, not implemented by device\n",
+ PC, PageCode);
rd_atapi_cmd_error(dev, channel, SENSE_ILLEGAL_REQUEST,
ASC_INV_FIELD_IN_CMD_PACKET);
rd_raise_interrupt(dev, channel);
}
case 0x3: // saved values not implemented
{
+ PrintError("\t\tSaved values not implemented in mode sense\n");
rd_atapi_cmd_error(dev, channel, SENSE_ILLEGAL_REQUEST, ASC_SAVING_PARAMETERS_NOT_SUPPORTED);
rd_raise_interrupt(dev, channel);
break;
}
default:
{
- PrintError("Should not get here!\n");
+ PrintError("Unsupported Mode sense value\n");
return -1;
break;
}
uint8_t alloc_length = controller->buffer[4];
if (rd_init_send_atapi_command(dev, channel, atapi_command, 36, alloc_length, false) == -1) {
+ PrintError("Error sending atapi command in inquiry\n");
return -1;
}
{
// no allocation length???
if (rd_init_send_atapi_command(dev, channel, atapi_command, 8, 8, false) == -1) {
+ PrintError("Error sending atapi command in read cdrom capacity\n");
return -1;
}
rd_ready_to_send_atapi(dev, channel);
} else {
+ PrintError("CDROM not ready in read cdrom capacity\n");
rd_atapi_cmd_error(dev, channel, SENSE_NOT_READY, ASC_MEDIUM_NOT_PRESENT);
rd_raise_interrupt(dev, channel);
}
rd_atapi_cmd_error(dev, channel, SENSE_ILLEGAL_REQUEST, ASC_INV_FIELD_IN_CMD_PACKET);
rd_raise_interrupt(dev, channel);
} else {
+ PrintError("Drive not ready in read cd with CD present\n");
rd_atapi_cmd_error(dev, channel, SENSE_NOT_READY, ASC_MEDIUM_NOT_PRESENT);
rd_raise_interrupt(dev, channel);
}
break;
}
-
++
if (rd_init_send_atapi_command(dev, channel, atapi_command, toc_length, alloc_length, false) == -1) {
+ PrintError("Failed to init send atapi command in read toc (fmt=%d)\n", format);
return -1;
}
// multi session stuff. we ignore this and emulate a single session only
if (rd_init_send_atapi_command(dev, channel, atapi_command, 12, alloc_length, false) == -1) {
+ PrintError("Failed to init send atapi command in read toc (fmt=%d)\n", format);
return -1;
}
return -1;
}
} else {
+ PrintError("CDROM not ready in read toc\n");
rd_atapi_cmd_error(dev, channel, SENSE_NOT_READY, ASC_MEDIUM_NOT_PRESENT);
rd_raise_interrupt(dev, channel);
}
}
if (transfer_length == 0) {
- rd_atapi_cmd_nop(dev, channel);
- rd_raise_interrupt(dev, channel);
PrintError("READ(%d) with transfer length 0, ok\n",
(atapi_command == 0x28) ? 10 : 12);
+ rd_atapi_cmd_nop(dev, channel);
+ rd_raise_interrupt(dev, channel);
break;
}
uint32_t lba = rd_read_32bit(controller->buffer + 2);
if (!(drive->cdrom.ready)) {
+ PrintError("CDROM not ready in seek\n");
rd_atapi_cmd_error(dev, channel, SENSE_NOT_READY, ASC_MEDIUM_NOT_PRESENT);
rd_raise_interrupt(dev, channel);
break;
}
if (lba > drive->cdrom.capacity) {
+ PrintError("LBA is greater than CDROM capacity in seek\n");
rd_atapi_cmd_error(dev, channel, SENSE_ILLEGAL_REQUEST, ASC_LOGICAL_BLOCK_OOR);
rd_raise_interrupt(dev, channel);
break;
}
- PrintDebug("\t\tcdrom: SEEK (ignored)\n");
+ PrintError("\t\tcdrom: SEEK (ignored)\n");
rd_atapi_cmd_nop(dev, channel);
rd_raise_interrupt(dev, channel);
drive->cdrom.locked = controller->buffer[4] & 1;
rd_atapi_cmd_nop(dev, channel);
} else {
+ PrintError("CD not ready in prevent/allow medium removal\n");
rd_atapi_cmd_error(dev, channel, SENSE_NOT_READY, ASC_MEDIUM_NOT_PRESENT);
}
UNUSED(track_number);
*/
if (!(drive->cdrom.ready)) {
+ PrintError("CDROM not ready in read sub-channel\n");
rd_atapi_cmd_error(dev, channel, SENSE_NOT_READY, ASC_MEDIUM_NOT_PRESENT);
rd_raise_interrupt(dev, channel);
} else {
}
if (rd_init_send_atapi_command(dev, channel, atapi_command, ret_len, alloc_length, false) == -1) {
+ PrintError("Error sending atapi command in read sub-channel\n");
return -1;
}
rd_ready_to_send_atapi(dev, channel);
case 0x51: // read disc info
{
// no-op to keep the Linux CD-ROM driver happy
+ PrintError("Error: Read disk info no-op to keep the Linux CD-ROM driver happy\n");
rd_atapi_cmd_error(dev, channel, SENSE_ILLEGAL_REQUEST, ASC_INV_FIELD_IN_CMD_PACKET);
rd_raise_interrupt(dev, channel);
break;
case 0x46: // ???
case 0x4a: // ???
PrintError("ATAPI command 0x%x not implemented yet\n",
- atapi_command);
+ atapi_command);
rd_atapi_cmd_error(dev, channel, SENSE_ILLEGAL_REQUEST, ASC_INV_FIELD_IN_CMD_PACKET);
rd_raise_interrupt(dev, channel);
break;
struct drive_t * drive = &(channel->drives[channel->drive_select]);
struct controller_t * controller = &(drive->controller);
- #ifdef DEBUG_RAMDISK
- {
- struct ramdisk_t *ramdisk = (struct ramdisk_t *)(dev->private_data);
- PrintDebug("[rd_atapi_cmd_error]\n");
- PrintDebug("Error: atapi_cmd_error channel=%02x key=%02x asc=%02x\n",
- get_channel_no(ramdisk, channel), sense_key, asc);
- }
- #endif
+
+ struct ramdisk_t *ramdisk = (struct ramdisk_t *)(dev->private_data);
+ PrintError("[rd_atapi_cmd_error]\n");
+ PrintError("Error: atapi_cmd_error channel=%02x key=%02x asc=%02x\n",
+ get_channel_no(ramdisk, channel), sense_key, asc);
+
controller->error_register = sense_key << 4;
controller->interrupt_reason.i_o = 1;
struct drive_t * drive = &(channel->drives[channel->drive_select]);
struct controller_t * controller = &(drive->controller);
- PrintDebug("[rd_command_aborted]\n");
- PrintDebug("\t\taborting on command 0x%02x {%s}\n", value, device_type_to_str(drive->device_type));
+ PrintError("[rd_command_aborted]\n");
+ PrintError("\t\taborting on command 0x%02x {%s}\n", value, device_type_to_str(drive->device_type));
controller->current_command = 0;
controller->status.busy = 0;
rd_init_hardware(ramdisk);
- dev_hook_io(dev, PRI_CTRL_PORT,
- &read_status_port, &write_ctrl_port);
-
- dev_hook_io(dev, PRI_DATA_PORT,
- &read_data_port, &write_data_port);
- dev_hook_io(dev, PRI_FEATURES_PORT,
- &read_general_port, &write_general_port);
- dev_hook_io(dev, PRI_SECT_CNT_PORT,
- &read_general_port, &write_general_port);
- dev_hook_io(dev, PRI_SECT_ADDR1_PORT,
- &read_general_port, &write_general_port);
- dev_hook_io(dev, PRI_SECT_ADDR2_PORT,
- &read_general_port, &write_general_port);
- dev_hook_io(dev, PRI_SECT_ADDR3_PORT,
- &read_general_port, &write_general_port);
- dev_hook_io(dev, PRI_DRV_SEL_PORT,
- &read_general_port, &write_general_port);
- dev_hook_io(dev, PRI_CMD_PORT,
- &read_status_port, &write_cmd_port);
-
-
- dev_hook_io(dev, SEC_CTRL_PORT,
- &read_status_port, &write_ctrl_port);
-
- dev_hook_io(dev, SEC_DATA_PORT,
- &read_data_port, &write_data_port);
- dev_hook_io(dev, SEC_FEATURES_PORT,
- &read_general_port, &write_general_port);
- dev_hook_io(dev, SEC_SECT_CNT_PORT,
- &read_general_port, &write_general_port);
- dev_hook_io(dev, SEC_SECT_ADDR1_PORT,
- &read_general_port, &write_general_port);
- dev_hook_io(dev, SEC_SECT_ADDR2_PORT,
- &read_general_port, &write_general_port);
- dev_hook_io(dev, SEC_SECT_ADDR3_PORT,
- &read_general_port, &write_general_port);
- dev_hook_io(dev, SEC_DRV_SEL_PORT,
- &read_general_port, &write_general_port);
- dev_hook_io(dev, SEC_CMD_PORT,
- &read_status_port, &write_cmd_port);
-
+ v3_dev_hook_io(dev, PRI_CTRL_PORT,
+ &read_status_port, &write_ctrl_port);
+
+ v3_dev_hook_io(dev, PRI_DATA_PORT,
+ &read_data_port, &write_data_port);
+ v3_dev_hook_io(dev, PRI_FEATURES_PORT,
+ &read_general_port, &write_general_port);
+ v3_dev_hook_io(dev, PRI_SECT_CNT_PORT,
+ &read_general_port, &write_general_port);
+ v3_dev_hook_io(dev, PRI_SECT_ADDR1_PORT,
+ &read_general_port, &write_general_port);
+ v3_dev_hook_io(dev, PRI_SECT_ADDR2_PORT,
+ &read_general_port, &write_general_port);
+ v3_dev_hook_io(dev, PRI_SECT_ADDR3_PORT,
+ &read_general_port, &write_general_port);
+ v3_dev_hook_io(dev, PRI_DRV_SEL_PORT,
+ &read_general_port, &write_general_port);
+ v3_dev_hook_io(dev, PRI_CMD_PORT,
+ &read_status_port, &write_cmd_port);
+
+
+ v3_dev_hook_io(dev, SEC_CTRL_PORT,
+ &read_status_port, &write_ctrl_port);
+
+ v3_dev_hook_io(dev, SEC_DATA_PORT,
+ &read_data_port, &write_data_port);
+ v3_dev_hook_io(dev, SEC_FEATURES_PORT,
+ &read_general_port, &write_general_port);
+ v3_dev_hook_io(dev, SEC_SECT_CNT_PORT,
+ &read_general_port, &write_general_port);
+ v3_dev_hook_io(dev, SEC_SECT_ADDR1_PORT,
+ &read_general_port, &write_general_port);
+ v3_dev_hook_io(dev, SEC_SECT_ADDR2_PORT,
+ &read_general_port, &write_general_port);
+ v3_dev_hook_io(dev, SEC_SECT_ADDR3_PORT,
+ &read_general_port, &write_general_port);
+ v3_dev_hook_io(dev, SEC_DRV_SEL_PORT,
+ &read_general_port, &write_general_port);
+ v3_dev_hook_io(dev, SEC_CMD_PORT,
+ &read_status_port, &write_cmd_port);
+
- dev_hook_io(dev, SEC_ADDR_REG_PORT,
- &read_general_port, &write_general_port);
+ v3_dev_hook_io(dev, SEC_ADDR_REG_PORT,
+ &read_general_port, &write_general_port);
- dev_hook_io(dev, PRI_ADDR_REG_PORT,
- &read_general_port, &write_general_port);
+ v3_dev_hook_io(dev, PRI_ADDR_REG_PORT,
+ &read_general_port, &write_general_port);
- struct vm_device *create_ramdisk()
+ struct vm_device * v3_create_ramdisk()
{
struct ramdisk_t *ramdisk;
PrintDebug("[create_ramdisk]\n");
- struct vm_device *device = create_device("RAMDISK", &dev_ops, ramdisk);
+ struct vm_device * device = v3_create_device("RAMDISK", &dev_ops, ramdisk);
return device;
}
-
static int check_bit_fields(struct controller_t * controller) {
//Check bit fields
controller->sector_count = 0;
return 0;
}
+
#endif
* redistribute, and modify it as specified in the file "V3VEE_LICENSE".
*/
+
#include <palacios/vmm_config.h>
#include <palacios/vmm.h>
#include <palacios/vmm_debug.h>
#include <devices/generic.h>
#include <devices/ramdisk.h>
#include <devices/cdrom.h>
+ #include <devices/bochs_debug.h>
- #define USE_GENERIC 1
-
- #define MAGIC_CODE 0xf1e2d3c4
-
+ #include <palacios/vmm_host_events.h>
+ #define USE_GENERIC 1
- 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];
- };
+ #define ROMBIOS_START 0x000f0000
+ #define VGABIOS_START 0x000c0000
memcpy(dst, &foo, length);
- PrintDebug("Passthrough mem read returning: %d (length=%d)\n", foo + (guest_addr & 0xfff), length);
+ PrintDebug("Passthrough mem read returning: %p (length=%d)\n", (void *)(foo + (guest_addr & 0xfff)), length);
return length;
}
}
- /*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) {
- struct guest_mem_layout * layout = (struct guest_mem_layout *)config_ptr->vm_kernel;
+ int v3_config_guest(struct guest_info * info, struct v3_vm_config * config_ptr) {
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;
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);
- if (layout->magic != MAGIC_CODE) {
+
+ /* layout rombios */
+ {
+ uint_t num_pages = (config_ptr->rombios_size + PAGE_SIZE - 1) / PAGE_SIZE;
+ void * guest_mem = V3_AllocPages(num_pages);
+
+ 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);
- PrintDebug("Layout Magic Mismatch (0x%x)\n", layout->magic);
- return -1;
+ PrintDebug("Adding Shadow Region (0x%p-0x%p) -> 0x%p\n",
+ (void *)ROMBIOS_START,
+ (void *)ROMBIOS_START + (num_pages * PAGE_SIZE),
+ (void *)guest_mem);
}
-
- PrintDebug("%d layout regions\n", layout->num_regions);
-
- region_start = (void *)&(layout->regions[layout->num_regions]);
-
- PrintDebug("region start = 0x%x\n", region_start);
-
- for (i = 0; i < layout->num_regions; i++) {
- struct layout_region * reg = &(layout->regions[i]);
- uint_t num_pages = (reg->length / PAGE_SIZE) + ((reg->length % PAGE_SIZE) ? 1 : 0);
- void * guest_mem = V3_AllocPages(num_pages);
-
- PrintDebug("Layout Region %d bytes\n", reg->length);
- memcpy(guest_mem, region_start, reg->length);
-
- PrintDebugMemDump((unsigned char *)(guest_mem), 16);
-
- add_shadow_region_passthrough(info, reg->final_addr, reg->final_addr + (num_pages * PAGE_SIZE), (addr_t)guest_mem);
-
- PrintDebug("Adding Shadow Region (0x%x-0x%x) -> 0x%x\n", reg->final_addr, reg->final_addr + (num_pages * PAGE_SIZE), guest_mem);
+
+
+ /* layout vgabios */
+ {
+ uint_t num_pages = (config_ptr->vgabios_size + PAGE_SIZE - 1) / PAGE_SIZE;
+ void * guest_mem = V3_AllocPages(num_pages);
+
+ PrintDebug("Layout Region %d bytes\n", config_ptr->vgabios_size);
+ memcpy(V3_VAddr(guest_mem), config_ptr->vgabios, config_ptr->vgabios_size);
+
+ add_shadow_region_passthrough(info, VGABIOS_START, VGABIOS_START + (num_pages * PAGE_SIZE), (addr_t)guest_mem);
- region_start += reg->length;
+ 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));
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);
